diff options
| author | click <none@none> | 2010-08-03 22:51:27 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-03 22:51:27 +0200 |
| commit | 33829ed45eec11d3e3b380b26fca4872e99c8f19 (patch) | |
| tree | df6a11bbb213e10d37ff91a498460974fbdaf8eb | |
| parent | c4c0f5734e79431639959f894ee84fb46d192145 (diff) | |
Clean up some crap - remove generated config.h (old junk) and also requirements for that in Error.h
--HG--
branch : trunk
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/server/shared/Debugging/Errors.h | 10 |
3 files changed, 12 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cde22deeaf4..9573bbc8460 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,7 +186,10 @@ endif() if( DEBUG ) message("* Build in debug-mode : Yes") - add_definitions(-g -DTRINITY_DEBUG) + add_definitions(-DTRINITY_DEBUG) + if(CMAKE_COMPILER_IS_GNUCXX) + add_definitions(-g) + endif() else() message("* Build in debug-mode : No (default)") endif() @@ -226,8 +229,6 @@ endif() message("") -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) - # Little tweak for OS X if( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) set(MACOSX 1) diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 92b0e1d0e43..9116189954c 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -50,6 +50,7 @@ file(GLOB_RECURSE sources_Spells Spells/*.cpp Spells/*.h) file(GLOB_RECURSE sources_Tools Tools/*.cpp Tools/*.h) file(GLOB_RECURSE sources_Weather Weather/*.cpp Weather/*.h) file(GLOB_RECURSE sources_World World/*.cpp World/*.h) +file(GLOB_RECURSE sources_PrecompiledHeaders PrecompiledHeaders/*.cpp PrecompiledHeaders/*.h) # Create game-libary set(game_STAT_SRCS @@ -90,6 +91,13 @@ set(game_STAT_SRCS ${sources_World} ) +if( MSVC ) + set(game_STAT_SRCS + ${game_STAT_SRCS} + ${sources_PrecompiledHeaders} + ) +endif() + include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/externals/mersennetwister diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h index 849ed17c0eb..7dda2f3b21c 100644 --- a/src/server/shared/Debugging/Errors.h +++ b/src/server/shared/Debugging/Errors.h @@ -23,16 +23,6 @@ #include "Common.h" -#if PLATFORM != PLATFORM_WINDOWS -#ifndef HAVE_CONFIG_H -#include <config.h> -#endif -#endif - -#ifdef HAVE_ACE_STACK_TRACE_H -#include "ace/Stack_Trace.h" -#endif - #ifdef HAVE_ACE_STACK_TRACE_H // old versions ACE not have Stack_Trace.h but used at some oS for better compatibility #define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; fprintf( stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__,__FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); ((void(*)())NULL)();} } #else |