Merge with default

--HG--
branch : multipass-stereo

code/nel/CMakeLists.txt

@@ -72,7 +72,11 @@ IF(WITH_NEL_SAMPLES)
   ADD_SUBDIRECTORY(samples)
 ENDIF(WITH_NEL_SAMPLES)
 
-IF(WITH_NEL_TOOLS)
+# 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)
+

code/nel/tools/3d/CMakeLists.txt

@@ -1,4 +1,7 @@
-SUBDIRS(
+
+IF(WITH_NEL_TOOLS)
+
+  SUBDIRS(
     build_coarse_mesh
     build_far_bank
     build_smallbank
@@ -26,37 +29,47 @@ SUBDIRS(
     zone_dump
     zviewer)
 
-IF(WIN32)
+ENDIF(WITH_NEL_TOOLS)
-  ADD_SUBDIRECTORY(ig_elevation)
-  ADD_SUBDIRECTORY(lightmap_optimizer)
 
+# For tools selection of only max plugins
+IF(WIN32)  
   IF(MFC_FOUND)
     ADD_SUBDIRECTORY(object_viewer)
-    ADD_SUBDIRECTORY(object_viewer_exe)
-    ADD_SUBDIRECTORY(tile_edit)
-  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(MFC_FOUND)
 ENDIF(WIN32)
 
-IF(WITH_QT)
+IF(WITH_NEL_TOOLS)
+
+  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)
+  ENDIF(WITH_QT)
   
-IF(SQUISH_FOUND)
+  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)
+  ENDIF(SQUISH_FOUND)
+
+  #crash_log_analyser
+  #shapes_exporter
+
+ENDIF(WITH_NEL_TOOLS)
 
-#crash_log_analyser
-#shapes_exporter

code/nel/tools/CMakeLists.txt

@@ -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)
+# Don't add other subdirectories if only max plugins are selected.
+IF(WITH_NEL_TOOLS)
+  IF(WITH_PACS)
     ADD_SUBDIRECTORY(pacs)
-ENDIF(WITH_PACS)
+  ENDIF(WITH_PACS)
   
-IF(WITH_LOGIC)
+  IF(WITH_LOGIC)
     ADD_SUBDIRECTORY(logic)
-ENDIF(WITH_LOGIC)
+  ENDIF(WITH_LOGIC)
   
-IF(WITH_GEORGES)
+  IF(WITH_GEORGES)
     ADD_SUBDIRECTORY(georges)
-ENDIF(WITH_GEORGES)
+  ENDIF(WITH_GEORGES)
   
-IF(WITH_SOUND)
+  IF(WITH_SOUND)
     ADD_SUBDIRECTORY(sound)
-ENDIF(WITH_SOUND)
+  ENDIF(WITH_SOUND)
   
-IF(WITH_NEL_TESTS)
+  IF(WITH_NEL_TESTS)
     ADD_SUBDIRECTORY(nel_unit_test)
-ENDIF(WITH_NEL_TESTS)
+  ENDIF(WITH_NEL_TESTS)
-
+ENDIF(WITH_NEL_TOOLS)
-#build_gamedata