Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Merged Windows and Mac OS executable types

Browse source
This commit is contained in:
kervala 2010-09-03 22:16:10 +02:00
parent 0ecb274bc4
commit 8c451ba6dd
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/client/src/CMakeLists.txt
View file

@ -44,8 +44,6 @@ if(APPLE)
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0") SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community") SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
ADD_EXECUTABLE(ryzom_client MACOSX_BUNDLE ${SRC})
# TODO: in release mode, cmake could copy all the dylibs into the .app # TODO: in release mode, cmake could copy all the dylibs into the .app
# bundle for redistribution... should some part of cpack handle that? # bundle for redistribution... should some part of cpack handle that?
# ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD # ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD
@ -57,11 +55,10 @@ if(APPLE)
# ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks # ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks
# # ... # # ...
# # install_name_tool the lib pathes # # install_name_tool the lib pathes
ELSE(APPLE)
ADD_EXECUTABLE(ryzom_client ${SRC})
ENDIF(APPLE) ENDIF(APPLE)
ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}
${LUA_INCLUDE_DIR} ${LUA_INCLUDE_DIR}