Minor cleanups to accomodate CMake-usage on Windows
--HG-- branch : trunk
This commit is contained in:
@@ -44,19 +44,21 @@ add_executable(authserver
|
||||
|
||||
add_dependencies(authserver revision.h)
|
||||
|
||||
if(NOT WIN32)
|
||||
if( NOT WIN32 )
|
||||
add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
|
||||
endif()
|
||||
|
||||
set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
|
||||
if( UNIX )
|
||||
set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
|
||||
set(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
|
||||
endif()
|
||||
|
||||
set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
|
||||
|
||||
if(WIN32)
|
||||
if( WIN32 )
|
||||
target_link_libraries(
|
||||
authserver
|
||||
shared
|
||||
|
||||
@@ -269,7 +269,8 @@ include_directories(
|
||||
)
|
||||
|
||||
if(NOT DO_SCRIPTS)
|
||||
set(game_STAT_SRCS ${game_STAT_SRCS}
|
||||
set(game_STAT_SRCS
|
||||
${game_STAT_SRCS}
|
||||
AI/ScriptedAI/ScriptedEscortAI.cpp
|
||||
AI/ScriptedAI/ScriptedCreature.cpp
|
||||
AI/ScriptedAI/ScriptedFollowerAI.cpp
|
||||
|
||||
@@ -16,10 +16,6 @@
|
||||
|
||||
#include "ScriptPCH.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#define DO_SCRIPTS
|
||||
#endif
|
||||
|
||||
#ifdef DO_SCRIPTS
|
||||
//custom
|
||||
|
||||
|
||||
@@ -118,30 +118,31 @@ include_directories(
|
||||
set(worldserver_LINK_FLAGS "")
|
||||
|
||||
add_executable(worldserver ${worldserver_SRCS})
|
||||
if(NOT WIN32)
|
||||
|
||||
if( NOT WIN32 )
|
||||
add_definitions(-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"')
|
||||
endif()
|
||||
|
||||
add_dependencies(worldserver revision.h)
|
||||
|
||||
set(worldserver_LINK_FLAGS
|
||||
"-pthread ${worldserver_LINK_FLAGS}"
|
||||
)
|
||||
if( UNIX )
|
||||
set(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
|
||||
set(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
|
||||
set(SCRIPT_LIB "")
|
||||
endif()
|
||||
|
||||
set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
|
||||
|
||||
if(DO_SCRIPTS)
|
||||
if( DO_SCRIPTS )
|
||||
set(SCRIPT_LIB "scripts")
|
||||
else(DO_SCRIPTS)
|
||||
else()
|
||||
set(SCRIPT_LIB "")
|
||||
endif(DO_SCRIPTS)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
if( WIN32 )
|
||||
target_link_libraries(
|
||||
worldserver
|
||||
game
|
||||
|
||||
Reference in New Issue
Block a user