Fixed: Some NeL tools in 3d directory don't need NeL 3D

This commit is contained in:
kervala 2014-08-01 17:17:53 +02:00
parent 5cb991c1b0
commit 8356b791d4
2 changed files with 35 additions and 35 deletions

View file

@ -1,40 +1,42 @@
IF(WITH_NEL_TOOLS) IF(WITH_NEL_TOOLS)
IF(WITH_3D)
SUBDIRS( SUBDIRS(
anim_builder
animation_set_builder
build_clod_bank
build_clodtex
build_coarse_mesh build_coarse_mesh
build_far_bank build_far_bank
build_shadow_skin
build_smallbank build_smallbank
ig_lighter cluster_viewer
file_info
ig_add
ig_elevation ig_elevation
ig_info
ig_lighter
lightmap_optimizer lightmap_optimizer
zone_dependencies zone_dependencies
zone_ig_lighter zone_ig_lighter
zone_lighter zone_lighter
zone_welder 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 shapes_exporter
tga_cut
tga_resize
shape2obj shape2obj
zone_check_bind zone_check_bind
zone_dump zone_dump
zviewer) zviewer)
ENDIF()
ENDIF(WITH_NEL_TOOLS) SUBDIRS(
build_interface
get_neighbors
tga_cut
tga_resize)
ENDIF()
# For tools selection of only max plugins # For tools selection of only max plugins
IF(WIN32) IF(WIN32 AND WITH_3D)
IF(MFC_FOUND) IF(MFC_FOUND)
ADD_SUBDIRECTORY(object_viewer) ADD_SUBDIRECTORY(object_viewer)
IF(WITH_NEL_MAXPLUGIN) IF(WITH_NEL_MAXPLUGIN)
@ -44,9 +46,9 @@ IF(WIN32)
ENDIF(MAXSDK_FOUND) ENDIF(MAXSDK_FOUND)
ENDIF(WITH_NEL_MAXPLUGIN) ENDIF(WITH_NEL_MAXPLUGIN)
ENDIF(MFC_FOUND) ENDIF(MFC_FOUND)
ENDIF(WIN32) ENDIF()
IF(WITH_NEL_TOOLS) IF(WITH_NEL_TOOLS AND WITH_3D)
IF(WIN32) IF(WIN32)
# ADD_SUBDIRECTORY(lightmap_optimizer) # ADD_SUBDIRECTORY(lightmap_optimizer)
IF(MFC_FOUND) IF(MFC_FOUND)
@ -71,5 +73,5 @@ IF(WITH_NEL_TOOLS)
#crash_log_analyser #crash_log_analyser
#shapes_exporter #shapes_exporter
ENDIF(WITH_NEL_TOOLS) ENDIF()

View file

@ -6,9 +6,7 @@ IF(WITH_NEL_TOOLS)
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.
IF(WITH_3D) ADD_SUBDIRECTORY(3d)
ADD_SUBDIRECTORY(3d)
ENDIF(WITH_3D)
# 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)