Clean up some crap - remove generated config.h (old junk) and also requirements for that in Error.h
--HG-- branch : trunk
This commit is contained in:
+4
-3
@@ -186,7 +186,10 @@ endif()
|
|||||||
|
|
||||||
if( DEBUG )
|
if( DEBUG )
|
||||||
message("* Build in debug-mode : Yes")
|
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()
|
else()
|
||||||
message("* Build in debug-mode : No (default)")
|
message("* Build in debug-mode : No (default)")
|
||||||
endif()
|
endif()
|
||||||
@@ -226,8 +229,6 @@ endif()
|
|||||||
|
|
||||||
message("")
|
message("")
|
||||||
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
|
||||||
|
|
||||||
# Little tweak for OS X
|
# Little tweak for OS X
|
||||||
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
|
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
|
||||||
set(MACOSX 1)
|
set(MACOSX 1)
|
||||||
|
|||||||
@@ -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_Tools Tools/*.cpp Tools/*.h)
|
||||||
file(GLOB_RECURSE sources_Weather Weather/*.cpp Weather/*.h)
|
file(GLOB_RECURSE sources_Weather Weather/*.cpp Weather/*.h)
|
||||||
file(GLOB_RECURSE sources_World World/*.cpp World/*.h)
|
file(GLOB_RECURSE sources_World World/*.cpp World/*.h)
|
||||||
|
file(GLOB_RECURSE sources_PrecompiledHeaders PrecompiledHeaders/*.cpp PrecompiledHeaders/*.h)
|
||||||
|
|
||||||
# Create game-libary
|
# Create game-libary
|
||||||
set(game_STAT_SRCS
|
set(game_STAT_SRCS
|
||||||
@@ -90,6 +91,13 @@ set(game_STAT_SRCS
|
|||||||
${sources_World}
|
${sources_World}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if( MSVC )
|
||||||
|
set(game_STAT_SRCS
|
||||||
|
${game_STAT_SRCS}
|
||||||
|
${sources_PrecompiledHeaders}
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
${CMAKE_BINARY_DIR}
|
${CMAKE_BINARY_DIR}
|
||||||
${CMAKE_SOURCE_DIR}/externals/mersennetwister
|
${CMAKE_SOURCE_DIR}/externals/mersennetwister
|
||||||
|
|||||||
@@ -23,16 +23,6 @@
|
|||||||
|
|
||||||
#include "Common.h"
|
#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
|
#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)();} }
|
#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
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user