diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt
index 4e21da876..99598307d 100644
--- a/code/nel/tools/3d/CMakeLists.txt
+++ b/code/nel/tools/3d/CMakeLists.txt
@@ -25,7 +25,6 @@ SUBDIRS(	build_coarse_mesh
 IF(WIN32) 
   ADD_SUBDIRECTORY(object_viewer)
   ADD_SUBDIRECTORY(object_viewer_exe)
-  ADD_SUBDIRECTORY(panoply_maker)
   ADD_SUBDIRECTORY(tile_edit)
 ENDIF(WIN32)
 
@@ -41,6 +40,7 @@ IF(WITH_MAXPLUGIN)
 ENDIF(WITH_MAXPLUGIN)
 
 IF(SQUISH_FOUND)
+  ADD_SUBDIRECTORY(panoply_maker)
   ADD_SUBDIRECTORY(tga_2_dds)
 ENDIF(SQUISH_FOUND)
 
diff --git a/code/nel/tools/3d/ig_elevation/CMakeLists.txt b/code/nel/tools/3d/ig_elevation/CMakeLists.txt
index ad0e04024..5f6c4a7c4 100644
--- a/code/nel/tools/3d/ig_elevation/CMakeLists.txt
+++ b/code/nel/tools/3d/ig_elevation/CMakeLists.txt
@@ -1,12 +1,13 @@
 FILE(GLOB SRC *.cpp *.h)
 
-DECORATE_NEL_LIB("nel3d")
-SET(NL3D_LIB ${LIBNAME})
-
 ADD_EXECUTABLE(ig_elevation ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ig_elevation ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
+
+TARGET_LINK_LIBRARIES(ig_elevation ${PLATFORM_LINKFLAGS} nelmisc nel3d)
+NL_DEFAULT_PROPS(ig_elevation "Tools, 3D: ig_elevation")
+NL_ADD_RUNTIME_FLAGS(ig_elevation)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS ig_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
diff --git a/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt b/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
index 865886999..3a15f394b 100644
--- a/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
+++ b/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
@@ -1,12 +1,9 @@
 FILE(GLOB SRC *.cpp *.h)
 
-DECORATE_NEL_LIB("nelmisc")
-SET(NLMISC_LIB ${LIBNAME})
-
 ADD_EXECUTABLE(lightmap_optimizer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(lightmap_optimizer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB})
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+TARGET_LINK_LIBRARIES(lightmap_optimizer ${PLATFORM_LINKFLAGS} nelmisc)
+NL_DEFAULT_PROPS(lightmap_optimizer "Tools, 3D: lightmap_optimizer")
+NL_ADD_RUNTIME_FLAGS(lightmap_optimizer)
 
 INSTALL(TARGETS lightmap_optimizer RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
diff --git a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt
index b84f03876..26e3c9004 100644
--- a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt
+++ b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt
@@ -1,16 +1,9 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(shapes_exporter ${SRC})
+ADD_EXECUTABLE(shapes_exporter WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(shapes_exporter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
-IF(WIN32)
-  SET_TARGET_PROPERTIES(shapes_exporter PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    LINK_FLAGS "/SUBSYSTEM:WINDOWS"
-    PROJECT_LABEL "Tools, 3D: Shapes Exporter")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+TARGET_LINK_LIBRARIES(shapes_exporter ${PLATFORM_LINKFLAGS} nelmisc nel3d)
+NL_DEFAULT_PROPS(shapes_exporter "Tools, 3D: Shapes Exporter")
+NL_ADD_RUNTIME_FLAGS(shapes_exporter)
 
 INSTALL(TARGETS shapes_exporter RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
diff --git a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
index f98a96a4d..946309274 100644
--- a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
+++ b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
@@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 
 ADD_EXECUTABLE(zone_ig_lighter ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(zone_ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d)
-IF(WIN32)
-  SET_TARGET_PROPERTIES(zone_ig_lighter PROPERTIES 
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: zone_ig_lighter")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+TARGET_LINK_LIBRARIES(zone_ig_lighter ${PLATFORM_LINKFLAGS} nelmisc nel3d)
+NL_DEFAULT_PROPS(zone_ig_lighter "Tools, 3D: zone_ig_lighter")
+NL_ADD_RUNTIME_FLAGS(zone_ig_lighter)
 
 INSTALL(TARGETS zone_ig_lighter RUNTIME DESTINATION bin COMPONENT tools3d)
diff --git a/code/nel/tools/georges/georges2csv/CMakeLists.txt b/code/nel/tools/georges/georges2csv/CMakeLists.txt
index 419430cc1..61e7b001a 100644
--- a/code/nel/tools/georges/georges2csv/CMakeLists.txt
+++ b/code/nel/tools/georges/georges2csv/CMakeLists.txt
@@ -3,8 +3,11 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(georges2csv ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
 TARGET_LINK_LIBRARIES(georges2csv ${PLATFORM_LINKFLAGS} nelmisc nelgeorges)
 NL_DEFAULT_PROPS(georges2csv "Tools, Georges: georges2csv")
 NL_ADD_RUNTIME_FLAGS(georges2csv)
 
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
 INSTALL(TARGETS georges2csv RUNTIME DESTINATION bin COMPONENT toolsgeorges)
diff --git a/code/nel/tools/pacs/build_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_rbank/CMakeLists.txt
index 7d74c68d4..57cdaaf18 100644
--- a/code/nel/tools/pacs/build_rbank/CMakeLists.txt
+++ b/code/nel/tools/pacs/build_rbank/CMakeLists.txt
@@ -10,5 +10,7 @@ TARGET_LINK_LIBRARIES(build_rbank ${PLATFORM_LINKFLAGS} nelpacs nel3d nelligo ne
 NL_DEFAULT_PROPS(build_rbank "Tools, PACS: build_rbank")
 NL_ADD_RUNTIME_FLAGS(build_rbank)
 
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
 INSTALL(TARGETS build_rbank RUNTIME DESTINATION bin COMPONENT toolspacs)
 INSTALL(FILES build_rbank.cfg DESTINATION etc/nel COMPONENT toolspacs)