Merged ryzom/ryzomcore into default

This commit is contained in:
Jan Boon 2014-02-02 00:52:25 +01:00
commit 4064df1687
3 changed files with 44 additions and 18 deletions

View file

@ -3,13 +3,22 @@ ADD_SUBDIRECTORY(make_alias_file)
ADD_SUBDIRECTORY(make_anim_by_race) ADD_SUBDIRECTORY(make_anim_by_race)
ADD_SUBDIRECTORY(make_anim_melee_impact) ADD_SUBDIRECTORY(make_anim_melee_impact)
ADD_SUBDIRECTORY(pd_parser) ADD_SUBDIRECTORY(pd_parser)
ADD_SUBDIRECTORY(translation_tools)
ADD_SUBDIRECTORY(assoc_mem) ADD_SUBDIRECTORY(assoc_mem)
ADD_SUBDIRECTORY(leveldesign) ADD_SUBDIRECTORY(leveldesign)
ADD_SUBDIRECTORY(patch_gen)
ADD_SUBDIRECTORY(pdr_util) IF(WITH_LIGO)
ADD_SUBDIRECTORY(translation_tools)
ENDIF(WITH_LIGO)
IF(WITH_NET)
ADD_SUBDIRECTORY(stats_scan) ADD_SUBDIRECTORY(stats_scan)
ADD_SUBDIRECTORY(pdr_util)
ADD_SUBDIRECTORY(patch_gen)
ENDIF(WITH_NET)
IF(WITH_LIGO AND WITH_NET)
ADD_SUBDIRECTORY(sheets_packer) ADD_SUBDIRECTORY(sheets_packer)
ENDIF(WITH_LIGO AND WITH_NET)
IF(WITH_RYZOM_CLIENT) IF(WITH_RYZOM_CLIENT)
ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)

View file

@ -1,26 +1,39 @@
ADD_SUBDIRECTORY(alias_synchronizer)
ADD_SUBDIRECTORY(prim_export)
ADD_SUBDIRECTORY(uni_conv) ADD_SUBDIRECTORY(uni_conv)
ADD_SUBDIRECTORY(csv_transform) ADD_SUBDIRECTORY(csv_transform)
ADD_SUBDIRECTORY(icon_search) ADD_SUBDIRECTORY(icon_search)
IF(WITH_LIGO)
ADD_SUBDIRECTORY(alias_synchronizer)
ADD_SUBDIRECTORY(prim_export)
ADD_SUBDIRECTORY(mission_compiler_lib) ADD_SUBDIRECTORY(mission_compiler_lib)
ENDIF(WITH_LIGO)
ADD_SUBDIRECTORY(mp_generator) ADD_SUBDIRECTORY(mp_generator)
ADD_SUBDIRECTORY(named_items_2_csv) ADD_SUBDIRECTORY(named_items_2_csv)
IF(WIN32) IF(WIN32)
IF(WITH_LIGO)
ADD_SUBDIRECTORY(export) ADD_SUBDIRECTORY(export)
ADD_SUBDIRECTORY(world_editor) ADD_SUBDIRECTORY(world_editor)
ENDIF(WITH_LIGO)
IF(WITH_MFC) IF(WITH_MFC)
IF(WITH_LIGO)
ADD_SUBDIRECTORY(mission_compiler_fe) ADD_SUBDIRECTORY(mission_compiler_fe)
ENDIF(WITH_LIGO)
IF(WITH_GEORGES)
ADD_SUBDIRECTORY(georges_dll) ADD_SUBDIRECTORY(georges_dll)
ADD_SUBDIRECTORY(georges_exe) ADD_SUBDIRECTORY(georges_exe)
IF(WITH_SOUND)
ADD_SUBDIRECTORY(georges_plugin_sound) ADD_SUBDIRECTORY(georges_plugin_sound)
ENDIF(WITH_SOUND)
ENDIF(WITH_GEORGES)
ENDIF(WITH_MFC) ENDIF(WITH_MFC)
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_QT) IF(WITH_QT)
IF(WITH_GEORGES)
ADD_SUBDIRECTORY(georges_editor_qt) ADD_SUBDIRECTORY(georges_editor_qt)
ENDIF(WITH_GEORGES)
ENDIF(WITH_QT) ENDIF(WITH_QT)
# folders not handled yet. # folders not handled yet.

View file

@ -1,6 +1,10 @@
# Deprecated, no longer used
IF(WITH_LIGO)
ADD_SUBDIRECTORY(ai_build_wmap) ADD_SUBDIRECTORY(ai_build_wmap)
ENDIF(WITH_LIGO)
IF(WITH_3D)
ADD_SUBDIRECTORY(build_world_packed_col) ADD_SUBDIRECTORY(build_world_packed_col)
ENDIF(WITH_3D)
# Not done yet. # Not done yet.
#admin #admin