From 6fb6baeb9021356269e13c4e3700512da4653d19 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Fri, 1 Aug 2014 17:17:53 +0200
Subject: [PATCH] Fixed: Some NeL tools in 3d directory don't need NeL 3D

---
 code/nel/tools/3d/CMakeLists.txt | 66 ++++++++++++++++----------------
 code/nel/tools/CMakeLists.txt    |  4 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt
index a07e8c53a..2ac0ac1c5 100644
--- a/code/nel/tools/3d/CMakeLists.txt
+++ b/code/nel/tools/3d/CMakeLists.txt
@@ -1,40 +1,42 @@
 
 IF(WITH_NEL_TOOLS)
-
+  IF(WITH_3D)
+    SUBDIRS(
+      anim_builder
+      animation_set_builder
+      build_clod_bank
+      build_clodtex
+      build_coarse_mesh
+      build_far_bank
+      build_shadow_skin
+      build_smallbank
+      cluster_viewer
+      file_info
+      ig_add
+      ig_elevation
+      ig_info
+      ig_lighter
+      lightmap_optimizer
+      zone_dependencies
+      zone_ig_lighter
+      zone_lighter
+      zone_welder
+      shapes_exporter
+      shape2obj
+      zone_check_bind
+      zone_dump
+      zviewer)
+  ENDIF()
+    
   SUBDIRS(
-    build_coarse_mesh
-    build_far_bank
-    build_smallbank
-    ig_lighter
-    ig_elevation
-    lightmap_optimizer
-    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)
-
-ENDIF(WITH_NEL_TOOLS)
+    tga_resize)
+ENDIF()
 
 # For tools selection of only max plugins
-IF(WIN32)  
+IF(WIN32 AND WITH_3D)
   IF(MFC_FOUND)
     ADD_SUBDIRECTORY(object_viewer)
     IF(WITH_NEL_MAXPLUGIN)
@@ -44,9 +46,9 @@ IF(WIN32)
       ENDIF(MAXSDK_FOUND)
     ENDIF(WITH_NEL_MAXPLUGIN)
   ENDIF(MFC_FOUND)
-ENDIF(WIN32)
+ENDIF()
 
-IF(WITH_NEL_TOOLS)
+IF(WITH_NEL_TOOLS AND WITH_3D)
   IF(WIN32)
 #    ADD_SUBDIRECTORY(lightmap_optimizer)  
     IF(MFC_FOUND)
@@ -71,5 +73,5 @@ IF(WITH_NEL_TOOLS)
   #crash_log_analyser
   #shapes_exporter
 
-ENDIF(WITH_NEL_TOOLS)
+ENDIF()
 
diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt
index abc5dff02..2c1f641a0 100644
--- a/code/nel/tools/CMakeLists.txt
+++ b/code/nel/tools/CMakeLists.txt
@@ -6,9 +6,7 @@ IF(WITH_NEL_TOOLS)
 ENDIF(WITH_NEL_TOOLS)
 
 # Max plugins are under the 3d directory as well.
-IF(WITH_3D)
-  ADD_SUBDIRECTORY(3d)
-ENDIF(WITH_3D)
+ADD_SUBDIRECTORY(3d)
 
 # Don't add other subdirectories if only max plugins are selected.
 IF(WITH_NEL_TOOLS)