Merge with default
--HG-- branch : multipass-stereo
This commit is contained in:
commit
f280f4673f
3 changed files with 100 additions and 77 deletions
|
@ -72,7 +72,11 @@ IF(WITH_NEL_SAMPLES)
|
|||
ADD_SUBDIRECTORY(samples)
|
||||
ENDIF(WITH_NEL_SAMPLES)
|
||||
|
||||
IF(WITH_NEL_TOOLS)
|
||||
FIND_PACKAGE(Squish)
|
||||
# Allow to compile only max plugins without other 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)
|
||||
ENDIF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
|
||||
|
||||
|
|
|
@ -1,62 +1,75 @@
|
|||
SUBDIRS(
|
||||
build_coarse_mesh
|
||||
build_far_bank
|
||||
build_smallbank
|
||||
ig_lighter
|
||||
zone_dependencies
|
||||
zone_ig_lighter
|
||||
zone_lighter
|
||||
zone_welder
|
||||
animation_set_builder
|
||||
anim_builder
|
||||
build_clod_bank
|
||||
build_clodtex
|
||||
build_interface
|
||||
build_shadow_skin
|
||||
cluster_viewer
|
||||
file_info
|
||||
get_neighbors
|
||||
ig_add
|
||||
ig_info
|
||||
shapes_exporter
|
||||
tga_cut
|
||||
tga_resize
|
||||
|
||||
IF(WITH_NEL_TOOLS)
|
||||
|
||||
SUBDIRS(
|
||||
build_coarse_mesh
|
||||
build_far_bank
|
||||
build_smallbank
|
||||
ig_lighter
|
||||
zone_dependencies
|
||||
zone_ig_lighter
|
||||
zone_lighter
|
||||
zone_welder
|
||||
animation_set_builder
|
||||
anim_builder
|
||||
build_clod_bank
|
||||
build_clodtex
|
||||
build_interface
|
||||
build_shadow_skin
|
||||
cluster_viewer
|
||||
file_info
|
||||
get_neighbors
|
||||
ig_add
|
||||
ig_info
|
||||
shapes_exporter
|
||||
tga_cut
|
||||
tga_resize
|
||||
shape2obj
|
||||
zone_check_bind
|
||||
zone_dump
|
||||
zviewer)
|
||||
zone_check_bind
|
||||
zone_dump
|
||||
zviewer)
|
||||
|
||||
ENDIF(WITH_NEL_TOOLS)
|
||||
|
||||
# For tools selection of only max plugins
|
||||
IF(WIN32)
|
||||
ADD_SUBDIRECTORY(ig_elevation)
|
||||
ADD_SUBDIRECTORY(lightmap_optimizer)
|
||||
|
||||
IF(MFC_FOUND)
|
||||
ADD_SUBDIRECTORY(object_viewer)
|
||||
ADD_SUBDIRECTORY(object_viewer_exe)
|
||||
ADD_SUBDIRECTORY(tile_edit)
|
||||
IF(WITH_NEL_MAXPLUGIN)
|
||||
IF(MAXSDK_FOUND)
|
||||
ADD_SUBDIRECTORY(plugin_max)
|
||||
ADD_SUBDIRECTORY(ligo)
|
||||
ENDIF(MAXSDK_FOUND)
|
||||
ENDIF(WITH_NEL_MAXPLUGIN)
|
||||
ENDIF(MFC_FOUND)
|
||||
|
||||
IF(WITH_NEL_MAXPLUGIN)
|
||||
IF(MAXSDK_FOUND)
|
||||
ADD_SUBDIRECTORY(plugin_max)
|
||||
ADD_SUBDIRECTORY(ligo)
|
||||
ENDIF(MAXSDK_FOUND)
|
||||
ENDIF(WITH_NEL_MAXPLUGIN)
|
||||
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_QT)
|
||||
ADD_SUBDIRECTORY(tile_edit_qt)
|
||||
ADD_SUBDIRECTORY(object_viewer_qt)
|
||||
ADD_SUBDIRECTORY(object_viewer_widget)
|
||||
ENDIF(WITH_QT)
|
||||
IF(WITH_NEL_TOOLS)
|
||||
|
||||
IF(SQUISH_FOUND)
|
||||
IF(WIN32)
|
||||
ADD_SUBDIRECTORY(ig_elevation)
|
||||
ADD_SUBDIRECTORY(lightmap_optimizer)
|
||||
IF(MFC_FOUND)
|
||||
ADD_SUBDIRECTORY(object_viewer_exe)
|
||||
ADD_SUBDIRECTORY(tile_edit)
|
||||
ENDIF(MFC_FOUND)
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_QT)
|
||||
ADD_SUBDIRECTORY(tile_edit_qt)
|
||||
ADD_SUBDIRECTORY(object_viewer_qt)
|
||||
ADD_SUBDIRECTORY(object_viewer_widget)
|
||||
ENDIF(WITH_QT)
|
||||
|
||||
IF(SQUISH_FOUND)
|
||||
ADD_SUBDIRECTORY(s3tc_compressor_lib)
|
||||
ADD_SUBDIRECTORY(panoply_maker)
|
||||
ADD_SUBDIRECTORY(tga_2_dds)
|
||||
ADD_SUBDIRECTORY(hls_bank_maker)
|
||||
ENDIF(SQUISH_FOUND)
|
||||
ADD_SUBDIRECTORY(panoply_maker)
|
||||
ADD_SUBDIRECTORY(tga_2_dds)
|
||||
ADD_SUBDIRECTORY(hls_bank_maker)
|
||||
ENDIF(SQUISH_FOUND)
|
||||
|
||||
#crash_log_analyser
|
||||
#shapes_exporter
|
||||
|
||||
ENDIF(WITH_NEL_TOOLS)
|
||||
|
||||
#crash_log_analyser
|
||||
#shapes_exporter
|
||||
|
|
|
@ -1,28 +1,34 @@
|
|||
ADD_SUBDIRECTORY(misc)
|
||||
ADD_SUBDIRECTORY(memory)
|
||||
|
||||
# Don't add other subdirectories if only max plugins are selected.
|
||||
IF(WITH_NEL_TOOLS)
|
||||
ADD_SUBDIRECTORY(misc)
|
||||
ADD_SUBDIRECTORY(memory)
|
||||
ENDIF(WITH_NEL_TOOLS)
|
||||
|
||||
# Max plugins are under the 3d directory as well.
|
||||
IF(WITH_3D)
|
||||
ADD_SUBDIRECTORY(3d)
|
||||
ENDIF(WITH_3D)
|
||||
|
||||
IF(WITH_PACS)
|
||||
ADD_SUBDIRECTORY(pacs)
|
||||
ENDIF(WITH_PACS)
|
||||
# Don't add other subdirectories if only max plugins are selected.
|
||||
IF(WITH_NEL_TOOLS)
|
||||
IF(WITH_PACS)
|
||||
ADD_SUBDIRECTORY(pacs)
|
||||
ENDIF(WITH_PACS)
|
||||
|
||||
IF(WITH_LOGIC)
|
||||
ADD_SUBDIRECTORY(logic)
|
||||
ENDIF(WITH_LOGIC)
|
||||
IF(WITH_LOGIC)
|
||||
ADD_SUBDIRECTORY(logic)
|
||||
ENDIF(WITH_LOGIC)
|
||||
|
||||
IF(WITH_GEORGES)
|
||||
ADD_SUBDIRECTORY(georges)
|
||||
ENDIF(WITH_GEORGES)
|
||||
IF(WITH_GEORGES)
|
||||
ADD_SUBDIRECTORY(georges)
|
||||
ENDIF(WITH_GEORGES)
|
||||
|
||||
IF(WITH_SOUND)
|
||||
ADD_SUBDIRECTORY(sound)
|
||||
ENDIF(WITH_SOUND)
|
||||
IF(WITH_SOUND)
|
||||
ADD_SUBDIRECTORY(sound)
|
||||
ENDIF(WITH_SOUND)
|
||||
|
||||
IF(WITH_NEL_TESTS)
|
||||
ADD_SUBDIRECTORY(nel_unit_test)
|
||||
ENDIF(WITH_NEL_TESTS)
|
||||
|
||||
#build_gamedata
|
||||
IF(WITH_NEL_TESTS)
|
||||
ADD_SUBDIRECTORY(nel_unit_test)
|
||||
ENDIF(WITH_NEL_TESTS)
|
||||
ENDIF(WITH_NEL_TOOLS)
|
||||
|
|
Loading…
Reference in a new issue