games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-15 22:16:37 +02:00
Code Issues Releases Activity

disable WIN32 flag for executables, fix previous commit

Browse Source
This commit is contained in:
Michael Pavlyshko 2014-07-10 00:47:22 +03:00
parent ce5f59e8b6
commit c935193558
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/CMakeLists.txt
View File

@ -47,13 +47,7 @@ set(client_SRCS
NetPacksClient.cpp NetPacksClient.cpp
) )
set(client_HEADERS if(APPLE)
gui/SDL_Pixels.h
)
if(WIN32)
add_executable(vcmiclient WIN32 ${client_SRCS} ${client_HEADERS})
elseif(APPLE)
# OS X specific includes # OS X specific includes
include_directories(${SPARKLE_INCLUDE_DIR}) include_directories(${SPARKLE_INCLUDE_DIR})
@ -104,10 +98,10 @@ elseif(APPLE)
add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle}) add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle})
else() else()
add_executable(vcmiclient ${client_SRCS} ${client_HEADERS}) add_executable(vcmiclient ${client_SRCS})
endif() endif()
target_link_libraries(vcmiclient vcmi ${Boost_LIBRARIES} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} ${ZLIB_LIBRARIES} ${FFMPEG_LIBRARIES} ${SOCKS_LIB} ${RT_LIB} ${DL_LIB}) target_link_libraries(vcmiclient vcmi ${Boost_LIBRARIES} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} ${ZLIB_LIBRARIES} ${FFMPEG_LIBRARIES} ${SYSTEM_LIBS})
set_target_properties(vcmiclient PROPERTIES ${PCH_PROPERTIES}) set_target_properties(vcmiclient PROPERTIES ${PCH_PROPERTIES})
cotire(vcmiclient) cotire(vcmiclient)

2
lib/CMakeLists.txt
View File

@ -133,7 +133,7 @@ set(lib_HEADERS
add_library(vcmi SHARED ${lib_SRCS} ${lib_HEADERS}) add_library(vcmi SHARED ${lib_SRCS} ${lib_HEADERS})
set_target_properties(vcmi PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@rpath/libvcmi.dylib") set_target_properties(vcmi PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@rpath/libvcmi.dylib")
set_target_properties(vcmi PROPERTIES COMPILE_DEFINITIONS "VCMI_DLL=1") set_target_properties(vcmi PROPERTIES COMPILE_DEFINITIONS "VCMI_DLL=1")
target_link_libraries(vcmi minizip ${Boost_LIBRARIES} ${SDL_LIBRARY} ${ZLIB_LIBRARIES} ${SOCKS_LIB} ${ICONV_LIB} ${RT_LIB} ${DL_LIB} ) target_link_libraries(vcmi minizip ${Boost_LIBRARIES} ${SDL_LIBRARY} ${ZLIB_LIBRARIES} ${SYSTEM_LIBS})
set_target_properties(vcmi PROPERTIES ${PCH_PROPERTIES}) set_target_properties(vcmi PROPERTIES ${PCH_PROPERTIES})
cotire(vcmi) cotire(vcmi)

6
server/CMakeLists.txt
View File

@ -12,13 +12,9 @@ set(server_SRCS
NetPacksServer.cpp NetPacksServer.cpp
) )
if(WIN32)
add_executable(vcmiserver WIN32 ${server_SRCS})
else()
add_executable(vcmiserver ${server_SRCS}) add_executable(vcmiserver ${server_SRCS})
endif()
target_link_libraries(vcmiserver vcmi ${Boost_LIBRARIES} ${RT_LIB} ${DL_LIB}) target_link_libraries(vcmiserver vcmi ${Boost_LIBRARIES} ${SYSTEM_LIBS})
set_target_properties(vcmiserver PROPERTIES ${PCH_PROPERTIES}) set_target_properties(vcmiserver PROPERTIES ${PCH_PROPERTIES})
set_target_properties(vcmiserver PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks @executable_path/") set_target_properties(vcmiserver PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks @executable_path/")