Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set

This commit is contained in:
kervala 2015-12-13 13:06:23 +01:00
parent bf73907da1
commit 451823bda9
9 changed files with 75 additions and 65 deletions

View file

@ -104,6 +104,7 @@ IF(WIN32)
ENDIF(WITH_MFC) ENDIF(WITH_MFC)
ENDIF(WIN32) ENDIF(WIN32)
FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(LibXml2 REQUIRED)
FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(PNG REQUIRED)
FIND_PACKAGE(GIF) FIND_PACKAGE(GIF)
@ -231,7 +232,7 @@ ENDIF(WITH_SNOWBALLS)
IF(WITH_TOOLS) IF(WITH_TOOLS)
ADD_SUBDIRECTORY(tool) ADD_SUBDIRECTORY(tool)
ENDIF(WITH_TOOLS) ENDIF()
IF(WITH_STUDIO) IF(WITH_STUDIO)
ADD_SUBDIRECTORY(studio) ADD_SUBDIRECTORY(studio)

View file

@ -64,18 +64,12 @@ IF(WITH_INSTALL_LIBRARIES)
ENDIF(UNIX) ENDIF(UNIX)
ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(include)
ENDIF(WITH_INSTALL_LIBRARIES) ENDIF()
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
IF(WITH_NEL_SAMPLES) IF(WITH_NEL_SAMPLES)
ADD_SUBDIRECTORY(samples) ADD_SUBDIRECTORY(samples)
ENDIF(WITH_NEL_SAMPLES) ENDIF()
# Allow to compile only max plugins without other tools. ADD_SUBDIRECTORY(tools)
IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
IF(WITH_NEL_TOOLS)
FIND_PACKAGE(Squish)
ENDIF(WITH_NEL_TOOLS)
ADD_SUBDIRECTORY(tools)
ENDIF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)

View file

@ -66,15 +66,17 @@ IF(WITH_NEL_TOOLS AND WITH_3D)
ADD_SUBDIRECTORY(object_viewer_widget) ADD_SUBDIRECTORY(object_viewer_widget)
ENDIF(WITH_QT) ENDIF(WITH_QT)
IF(WITH_NEL_TOOLS)
FIND_PACKAGE(Squish)
ENDIF()
IF(SQUISH_FOUND) IF(SQUISH_FOUND)
ADD_SUBDIRECTORY(s3tc_compressor_lib) ADD_SUBDIRECTORY(s3tc_compressor_lib)
ADD_SUBDIRECTORY(panoply_maker) ADD_SUBDIRECTORY(panoply_maker)
ADD_SUBDIRECTORY(tga_2_dds) ADD_SUBDIRECTORY(tga_2_dds)
ADD_SUBDIRECTORY(hls_bank_maker) ADD_SUBDIRECTORY(hls_bank_maker)
ENDIF(SQUISH_FOUND) ENDIF()
#crash_log_analyser #crash_log_analyser
#shapes_exporter
ENDIF() ENDIF()

View file

@ -1,11 +1,15 @@
# Don't add other subdirectories if only max plugins are selected. # Don't add other subdirectories if only max plugins are selected.
ADD_SUBDIRECTORY(misc)
IF(WITH_NEL_TOOLS) IF(WITH_NEL_TOOLS)
ADD_SUBDIRECTORY(misc)
ADD_SUBDIRECTORY(memory) ADD_SUBDIRECTORY(memory)
ENDIF(WITH_NEL_TOOLS) ENDIF(WITH_NEL_TOOLS)
# Max plugins are under the 3d directory as well. # Max plugins are under the 3d directory as well.
ADD_SUBDIRECTORY(3d) # Allow to compile only max plugins without other tools.
IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
ADD_SUBDIRECTORY(3d)
ENDIF()
# Don't add other subdirectories if only max plugins are selected. # Don't add other subdirectories if only max plugins are selected.
IF(WITH_NEL_TOOLS) IF(WITH_NEL_TOOLS)

View file

@ -1,12 +1,17 @@
SUBDIRS(bnp_make disp_sheet_id extract_filename lock make_sheet_id xml_packer) # always compile crash report
IF(WITH_QT OR WITH_QT5) IF(WITH_QT OR WITH_QT5)
ADD_SUBDIRECTORY(words_dic_qt)
ADD_SUBDIRECTORY(message_box_qt)
ADD_SUBDIRECTORY(crash_report) ADD_SUBDIRECTORY(crash_report)
ENDIF() ENDIF()
IF(WIN32) IF(WITH_NEL_TOOLS)
SUBDIRS(bnp_make disp_sheet_id extract_filename lock make_sheet_id xml_packer)
IF(WITH_QT OR WITH_QT5)
ADD_SUBDIRECTORY(words_dic_qt)
ADD_SUBDIRECTORY(message_box_qt)
ENDIF()
IF(WIN32)
ADD_SUBDIRECTORY(exec_timeout) ADD_SUBDIRECTORY(exec_timeout)
ADD_SUBDIRECTORY(message_box) ADD_SUBDIRECTORY(message_box)
ADD_SUBDIRECTORY(multi_cd_setup_fix) ADD_SUBDIRECTORY(multi_cd_setup_fix)
@ -18,6 +23,7 @@ IF(WIN32)
ADD_SUBDIRECTORY(log_analyser_plug_ins) ADD_SUBDIRECTORY(log_analyser_plug_ins)
ADD_SUBDIRECTORY(words_dic) ADD_SUBDIRECTORY(words_dic)
ENDIF() ENDIF()
ENDIF() ENDIF()
ADD_SUBDIRECTORY(probe_timers) ADD_SUBDIRECTORY(probe_timers)
ENDIF()

View file

@ -1,8 +1,6 @@
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#Platform specifics #Platform specifics
FIND_PACKAGE(ZLIB)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src )
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src) SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
@ -20,9 +18,7 @@ ELSEIF(WITH_RYZOM_TOOLS)
ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)
ENDIF(WITH_RYZOM_CLIENT) ENDIF(WITH_RYZOM_CLIENT)
IF(WITH_RYZOM_TOOLS) ADD_SUBDIRECTORY(tools)
ADD_SUBDIRECTORY(tools)
ENDIF(WITH_RYZOM_TOOLS)
IF(WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS) IF(WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS)
# Need servershare for build packed collision tool # Need servershare for build packed collision tool

View file

@ -1,30 +1,32 @@
ADD_SUBDIRECTORY(skill_extractor) IF(WITH_RYZOM_TOOLS)
ADD_SUBDIRECTORY(make_alias_file) ADD_SUBDIRECTORY(skill_extractor)
ADD_SUBDIRECTORY(make_anim_by_race) ADD_SUBDIRECTORY(make_alias_file)
ADD_SUBDIRECTORY(make_anim_melee_impact) ADD_SUBDIRECTORY(make_anim_by_race)
ADD_SUBDIRECTORY(pd_parser) ADD_SUBDIRECTORY(make_anim_melee_impact)
ADD_SUBDIRECTORY(assoc_mem) ADD_SUBDIRECTORY(pd_parser)
ADD_SUBDIRECTORY(leveldesign) ADD_SUBDIRECTORY(assoc_mem)
ADD_SUBDIRECTORY(leveldesign)
IF(WITH_LIGO) IF(WITH_LIGO)
ADD_SUBDIRECTORY(translation_tools) ADD_SUBDIRECTORY(translation_tools)
ENDIF(WITH_LIGO) ENDIF()
IF(WITH_NET) IF(WITH_NET)
ADD_SUBDIRECTORY(stats_scan) ADD_SUBDIRECTORY(stats_scan)
ADD_SUBDIRECTORY(pdr_util) ADD_SUBDIRECTORY(pdr_util)
ADD_SUBDIRECTORY(patch_gen) ADD_SUBDIRECTORY(patch_gen)
IF(WIN32) IF(WIN32)
ADD_SUBDIRECTORY(sheets_packer_shard) ADD_SUBDIRECTORY(sheets_packer_shard)
ENDIF(WIN32) ENDIF()
ENDIF(WITH_NET) ENDIF()
IF(WITH_LIGO AND WITH_NET) IF(WITH_LIGO AND WITH_NET)
ADD_SUBDIRECTORY(sheets_packer) ADD_SUBDIRECTORY(sheets_packer)
ENDIF(WITH_LIGO AND WITH_NET) ENDIF()
ENDIF()
ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(server) ADD_SUBDIRECTORY(server)
# Old stuff that doesn't compile anymore. # Old stuff that doesn't compile anymore.

View file

@ -6,4 +6,6 @@ IF(WITH_RYZOM_CLIENT)
ENDIF() ENDIF()
ENDIF() ENDIF()
ADD_SUBDIRECTORY(r2_islands_textures) IF(WITH_RYZOM_TOOLS)
ADD_SUBDIRECTORY(r2_islands_textures)
ENDIF()

View file

@ -1,9 +1,12 @@
IF(WITH_LIGO) IF(WITH_RYZOM_TOOLS)
IF(WITH_LIGO)
ADD_SUBDIRECTORY(ai_build_wmap) ADD_SUBDIRECTORY(ai_build_wmap)
ENDIF(WITH_LIGO) ENDIF()
IF(WITH_3D)
IF(WITH_3D)
ADD_SUBDIRECTORY(build_world_packed_col) ADD_SUBDIRECTORY(build_world_packed_col)
ENDIF(WITH_3D) ENDIF()
ENDIF()
# Not done yet. # Not done yet.
#admin #admin