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

Added: client.rc in sources and NL_ADD_LIB_SUFFIX for Ryzom client

Browse source
This commit is contained in:
kervala 2010-09-14 13:53:14 +02:00
parent 13de385469
commit e9a70bbe13
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ ENDIF(WIN32)
ADD_SUBDIRECTORY(client_sheets) ADD_SUBDIRECTORY(client_sheets)
ADD_SUBDIRECTORY(seven_zip) ADD_SUBDIRECTORY(seven_zip)
FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h motion/modes/*.cpp motion/modes/*.h r2/*.h r2/*.cpp r2/dmc/*.h r2/dmc/*.cpp interface_v3/*.h interface_v3/*.cpp) FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h motion/modes/*.cpp motion/modes/*.h r2/*.h r2/*.cpp r2/dmc/*.h r2/dmc/*.cpp interface_v3/*.h interface_v3/*.cpp client.rc)
# Filter out the source files not actually compiled. # Filter out the source files not actually compiled.
LIST(REMOVE_ITEM SRC LIST(REMOVE_ITEM SRC
@ -28,11 +28,6 @@ LIST(REMOVE_ITEM SRC
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.cpp ${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.cpp
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.h) ${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.h)
# On Unix we'll need to include config.h
#IF(UNIX)
# INCLUDE(${CMAKE_BINARY_DIR})
#ENDIF(UNIX)
# on Mac, create a .App Bundle # on Mac, create a .App Bundle
if(APPLE) if(APPLE)
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client") SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
@ -69,22 +64,21 @@ INCLUDE_DIRECTORIES(
) )
TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS} TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS}
nelmisc nelmisc
nelnet nelnet
nelligo nelligo
nelgeorges nelgeorges
nel3d nel3d
nelsound nelsound
nelsnd_lowlevel ryzom_clientsheets
ryzom_clientsheets ryzom_gameshare
ryzom_gameshare nelpacs
nelpacs ${LIBXML2_LIBRARIES}
${LIBXML2_LIBRARIES} ${LUA_LIBRARIES}
${LUA_LIBRARIES} ${LUABIND_LIBRARIES}
${LUABIND_LIBRARIES} ${CURL_LIBRARIES}
${CURL_LIBRARIES} ${LIBWWW_LIBRARIES}
${LIBWWW_LIBRARIES} ${SEVENZIP_LIBRARY})
${SEVENZIP_LIBRARY})
IF(NOT APPLE AND NOT WIN32) IF(NOT APPLE AND NOT WIN32)
TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES}) TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
@ -95,6 +89,8 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS})
NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client") NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
NL_ADD_RUNTIME_FLAGS(ryzom_client) NL_ADD_RUNTIME_FLAGS(ryzom_client)
NL_ADD_LIB_SUFFIX(ryzom_client)
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
ENDIF(WITH_PCH) ENDIF(WITH_PCH)