Some necessary ryzom tools did not build when client and server were unchecked
This commit is contained in:
parent
02dc3c1cfe
commit
347d4e0940
5 changed files with 41 additions and 6 deletions
|
@ -46,6 +46,12 @@ IF(WITH_RYZOM_CLIENT)
|
|||
ENDIF(CURL_STATIC)
|
||||
|
||||
ADD_SUBDIRECTORY(client)
|
||||
|
||||
ELSEIF(WITH_RYZOM_TOOLS)
|
||||
|
||||
# Need clientsheets lib for sheets packer tool
|
||||
ADD_SUBDIRECTORY(client)
|
||||
|
||||
ENDIF(WITH_RYZOM_CLIENT)
|
||||
|
||||
IF(WITH_RYZOM_TOOLS)
|
||||
|
@ -53,6 +59,14 @@ IF(WITH_RYZOM_TOOLS)
|
|||
ENDIF(WITH_RYZOM_TOOLS)
|
||||
|
||||
IF(WITH_RYZOM_SERVER)
|
||||
|
||||
FIND_PACKAGE(MySQL REQUIRED)
|
||||
ADD_SUBDIRECTORY(server)
|
||||
|
||||
ELSEIF(WITH_RYZOM_TOOLS)
|
||||
|
||||
# Need servershare for build packed collision tool
|
||||
# Need aishare for build wmap tool
|
||||
ADD_SUBDIRECTORY(server)
|
||||
|
||||
ENDIF(WITH_RYZOM_SERVER)
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
|
||||
# Need clientsheets lib for sheets packer tool
|
||||
ADD_SUBDIRECTORY(src)
|
||||
|
||||
IF(WITH_RYZOM_CLIENT)
|
||||
|
||||
#ADD_SUBDIRECTORY(data)
|
||||
#ADD_SUBDIRECTORY(patcher)
|
||||
|
||||
|
@ -12,3 +17,5 @@ IF(RYZOM_ETC_PREFIX)
|
|||
ELSE(RYZOM_ETC_PREFIX)
|
||||
INSTALL(FILES client_default.cfg DESTINATION etc/ryzom)
|
||||
ENDIF(RYZOM_ETC_PREFIX)
|
||||
|
||||
ENDIF(WITH_RYZOM_CLIENT)
|
||||
|
|
|
@ -1,10 +1,15 @@
|
|||
|
||||
# Need clientsheets lib for sheets packer tool
|
||||
ADD_SUBDIRECTORY(client_sheets)
|
||||
|
||||
IF(WITH_RYZOM_CLIENT)
|
||||
|
||||
# These are Windows/MFC apps
|
||||
IF(WIN32)
|
||||
# ADD_SUBDIRECTORY(bug_report)
|
||||
SET(SEVENZIP_LIBRARY "ryzom_sevenzip")
|
||||
ENDIF(WIN32)
|
||||
|
||||
ADD_SUBDIRECTORY(client_sheets)
|
||||
ADD_SUBDIRECTORY(seven_zip)
|
||||
|
||||
FILE(GLOB CFG ../*.cfg ../*.cfg.in)
|
||||
|
@ -124,3 +129,5 @@ IF(WITH_PCH)
|
|||
ENDIF(WITH_PCH)
|
||||
|
||||
INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications)
|
||||
|
||||
ENDIF(WITH_RYZOM_CLIENT)
|
||||
|
|
|
@ -1,7 +1,14 @@
|
|||
|
||||
# Supporting modules and libraries.
|
||||
ADD_SUBDIRECTORY(admin_modules)
|
||||
# Need servershare for build packed collision tool
|
||||
# Need aishare for build wmap tool
|
||||
ADD_SUBDIRECTORY(server_share)
|
||||
ADD_SUBDIRECTORY(ai_share)
|
||||
|
||||
IF(WITH_RYZOM_SERVER)
|
||||
|
||||
# Supporting modules and libraries.
|
||||
ADD_SUBDIRECTORY(admin_modules)
|
||||
ADD_SUBDIRECTORY(gameplay_module_lib)
|
||||
ADD_SUBDIRECTORY(pd_lib)
|
||||
|
||||
|
@ -40,3 +47,5 @@ ADD_SUBDIRECTORY(general_utilities_service)
|
|||
#sabrina
|
||||
#simulation_service
|
||||
#testing_tool_service
|
||||
|
||||
ENDIF(WITH_RYZOM_SERVER)
|
||||
|
|
|
@ -9,15 +9,13 @@ ADD_SUBDIRECTORY(leveldesign)
|
|||
ADD_SUBDIRECTORY(patch_gen)
|
||||
ADD_SUBDIRECTORY(pdr_util)
|
||||
ADD_SUBDIRECTORY(stats_scan)
|
||||
ADD_SUBDIRECTORY(sheets_packer)
|
||||
|
||||
IF(WITH_RYZOM_CLIENT)
|
||||
ADD_SUBDIRECTORY(sheets_packer)
|
||||
ADD_SUBDIRECTORY(client)
|
||||
ENDIF(WITH_RYZOM_CLIENT)
|
||||
|
||||
IF(WITH_RYZOM_SERVER)
|
||||
ADD_SUBDIRECTORY(server)
|
||||
ENDIF(WITH_RYZOM_SERVER)
|
||||
ADD_SUBDIRECTORY(server)
|
||||
|
||||
# Old stuff that doesn't compile anymore.
|
||||
#ADD_SUBDIRECTORY(occ2huff)
|
||||
|
|
Loading…
Reference in a new issue