diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt
index 358b9ea95..10762ab1a 100644
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@@ -77,11 +77,17 @@ SET(WITH_3D	ON )
 
 FIND_PACKAGE(Threads REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
-FIND_PACKAGE(Lua50 REQUIRED)
+IF(WITH_LUA51)
+  FIND_PACKAGE(Lua51 REQUIRED)
+ELSE(WITH_LUA51)
+  FIND_PACKAGE(Lua50 REQUIRED)
+ENDIF(WITH_LUA51)
 FIND_PACKAGE(CURL REQUIRED)
 FIND_PACKAGE(Libwww)
-FIND_PACKAGE(X11)
 
+IF(NOT WIN32)
+  FIND_PACKAGE(X11)
+ENDIF(NOT WIN32)
 
 NL_SETUP_BUILD()
 
@@ -89,37 +95,6 @@ NL_CONFIGURE_CHECKS()
 
 FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED)
 
-###
-# An example of finding NeL 3D and CEGUI Renderer.
-###
-IF(WITH_3D)
-  FIND_PACKAGE(FreeType)
-#  FIND_PACKAGE(NeL3D)
-  FIND_PACKAGE(Jpeg)
-#  
-#  IF(WITH_DRIVER_OPENGL)
-#    FIND_PACKAGE(OpenGL)
-#    FIND_PACKAGE(NeLDriverGL)
-#  ENDIF(WITH_DRIVER_OPENGL)
-#
-#  IF(WITH_CEGUI)
-#    FIND_PACKAGE(CEGUI)
-#    FIND_PACKAGE(NeLCEGUIRenderer)
-#  ENDIF(WITH_CEGUI)
-#
-#  SET(JPEG_LIB jpeg)
-ENDIF(WITH_3D)
-
-###
-# An example of finding sound and a driver.
-###
-#IF(WITH_SOUND)
-#  FIND_PACKAGE(NeLSound)
-#  IF(WITH_DRIVER_OPENAL)
-#    FIND_PACKAGE(OpenAL)
-#    FIND_PACKAGE(NeLDriverAL)
-#  ENDIF(WITH_DRIVER_OPENAL)
-#ENDIF(WITH_SOUND)
 
 IF(WIN32)
   INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
@@ -132,6 +107,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
 NL_SETUP_BUILD_FLAGS()
 
 ADD_SUBDIRECTORY(common)
-ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(tools)
+
+IF(WITH_CLIENT)
+  ADD_SUBDIRECTORY(client)
+ENDIF(WITH_CLIENT)
+
+IF(WITH_TOOLS)
+  ADD_SUBDIRECTORY(tools)
+ENDIF(WITH_TOOLS)
 
diff --git a/code/ryzom/CMakeModules/nel.cmake b/code/ryzom/CMakeModules/nel.cmake
index 84aca82a2..d6bedfebf 100644
--- a/code/ryzom/CMakeModules/nel.cmake
+++ b/code/ryzom/CMakeModules/nel.cmake
@@ -5,164 +5,173 @@ MACRO(CHECK_OUT_OF_SOURCE)
   IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
     MESSAGE(FATAL_ERROR "
 
-CMake generation for this project is not allowed within the source directory!
-Remove the CMakeCache.txt file and try again from another folder, e.g.:
-
-   rm CMakeCache.txt
-   mkdir cmake
-   cd cmake
-   cmake -G \"Unix Makefiles\" ..
-    ")
-  ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-
-ENDMACRO(CHECK_OUT_OF_SOURCE)
-
-MACRO(NL_SETUP_DEFAULT_OPTIONS)
-  ###
-  # Features
-  ###
-  OPTION(WITH_LOGGING             "With Logging"                                  ON )
-  OPTION(WITH_COVERAGE            "With Code Coverage Support"                    OFF)
-
-  ###
-  # Optional support
-  ###
-  OPTION(WITH_SOUND       "Build Sound Support"                                   OFF)
-  OPTION(BUILD_DASHBOARD  "Build to the CDash dashboard"                          OFF)
-ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)
+CMake generation for this project is not allowed within the source directory!
+Remove the CMakeCache.txt file and try again from another folder, e.g.:
+
+   rm CMakeCache.txt
+   mkdir cmake
+   cd cmake
+   cmake -G \"Unix Makefiles\" ..
+    ")
+  ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+
+ENDMACRO(CHECK_OUT_OF_SOURCE)
+
+MACRO(NL_SETUP_DEFAULT_OPTIONS)
+  ###
+  # Build options
+  ###
+
+  OPTION(WITH_CLIENT		"Build Ryzom Core Client"			ON )
+  OPTION(WITH_TOOLS		"Build Ryzom Core Tools"			ON )
+  OPTION(WITH_SERVER		"Build Ryzom Core Services"			ON )
+  OPTION(WITH_LUA51		"Build Ryzom Core using Lua51"			OFF)
+
+  ###
+  # Features
+  ###
+  OPTION(WITH_LOGGING             "With Logging"                                  ON )
+  OPTION(WITH_COVERAGE            "With Code Coverage Support"                    OFF)
+
+  ###
+  # Optional support
+  ###
+  OPTION(WITH_SOUND       "Build Sound Support"                                   OFF)
+  OPTION(BUILD_DASHBOARD  "Build to the CDash dashboard"                          OFF)
+ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)
 
 
-MACRO(NL_SETUP_BUILD)
-
-  #-----------------------------------------------------------------------------
-  # Setup the buildmode variables.
-  #
-  # None                  = NL_RELEASE_DEBUG
-  # Debug                 = NL_DEBUG
-  # Release               = NL_RELEASE
-  # RelWithDebInfo        = NL_RELEASE_DEBUG
-  # MinSizeRel            = NL_RELEASE_DEBUG
-
-  # None                  = NL_RELEASE
-  # Debug                 = NL_DEBUG
-  # Release               = NL_RELEASE, NL_NO_DEBUG
-  # RelWithDebInfo        = NL_RELEASE
-  # MinSizeRel            = NL_RELEASE, NL_NO_DEBUG
-
-  IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-    SET(NL_BUILD_MODE "NL_DEBUG")
-  ELSE(CMAKE_BUILD_TYPE MATCHES "Debug")
-    IF(CMAKE_BUILD_TYPE MATCHES "Release")
-      SET(NL_BUILD_MODE "NL_RELEASE")
-    ELSE(CMAKE_BUILD_TYPE MATCHES "Release")
-      SET(NL_BUILD_MODE "NL_RELEASE")
-      # enforce release mode if it's neither Debug nor Release
-      SET(CMAKE_BUILD_TYPE "Release")
-    ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
-  ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
-
-  IF(WIN32)
-    SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-")
-    SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF")
-    SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
-  ELSE(WIN32)
-    SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
-    IF(WITH_COVERAGE)
-      SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
-    ENDIF(WITH_COVERAGE)
-    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
-    SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
-    SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
-    SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
-    SET(NL_NONE_CFLAGS "-DNL_RELEASE -g -finline-functions -O2 ")
-  ENDIF(WIN32)
-
-  # Determine host CPU
-  IF(UNIX AND NOT WIN32)
-    FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
-    IF(CMAKE_UNAME)
-      EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
-      SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)")
-      IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-        ADD_DEFINITIONS(-DHAVE_X86_64)
-      ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
-        ADD_DEFINITIONS(-DHAVE_IA64)
-      ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-        ADD_DEFINITIONS(-DHAVE_X86)
-      ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-    ELSE(CMAKE_UNAME)  # Assume that if uname is not found that we're x86.
-      ADD_DEFINITIONS(-DHAVE_X86)
-    ENDIF(CMAKE_UNAME)
-  ENDIF(UNIX AND NOT WIN32)
-
-ENDMACRO(NL_SETUP_BUILD)
-
-MACRO(NL_SETUP_BUILD_FLAGS)
-  ## None
-  #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
-  #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
-
-  ## Debug
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
-
-  ## Release
-  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
-
-  ## RelWithDebInfo
-  SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
-
-  ## MinSizeRel
-  SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
-  SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
-ENDMACRO(NL_SETUP_BUILD_FLAGS)
-
-MACRO(NL_SETUP_PREFIX_PATHS)
-  ## Allow override of install_prefix/etc path.
-  IF(NOT NL_ETC_PREFIX)
-    IF(WIN32)
-      SET(NL_ETC_PREFIX "../etc" CACHE PATH "Installation path for configurations")
-    ELSE(WIN32)
-      SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Installation path for configurations")
-    ENDIF(WIN32)
-  ENDIF(NOT NL_ETC_PREFIX)
-
-  ## Allow override of install_prefix/share path.
-  IF(NOT NL_SHARE_PREFIX)
-    IF(WIN32)
-	  SET(NL_SHARE_PREFIX "../share" CACHE PATH "Installation path for data.")
-	ELSE(WIN32)
-	  SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Installation path for data.")
-	ENDIF(WIN32)
-  ENDIF(NOT NL_SHARE_PREFIX)
-
-  ## Allow override of install_prefix/sbin path.
-  IF(NOT NL_SBIN_PREFIX)
-	IF(WIN32)
-	  SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.")
-	ELSE(WIN32)
-	  SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.")
-	ENDIF(WIN32)
-  ENDIF(NOT NL_SBIN_PREFIX)
-
-  ## Allow override of install_prefix/bin path.
-  IF(NOT NL_BIN_PREFIX)
-    IF(WIN32)
-		SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.")
-    ELSE(WIN32)
-		SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.")
-    ENDIF(WIN32)
-  ENDIF(NOT NL_BIN_PREFIX)
-
-  ## Allow override of install_prefix/bin path.
-  IF(NOT NL_LOG_PREFIX)
-    IF(WIN32)
-      SET(NL_LOG_PREFIX "../var/log" CACHE PATH "Installation path for tools and applications.")
-    ELSE(WIN32)
-      SET(NL_LOG_PREFIX "${CMAKE_INSTALL_PREFIX}/var/log" CACHE PATH "Installation path for tools and applications.")
-    ENDIF(WIN32)
-  ENDIF(NOT NL_LOG_PREFIX)
-
-ENDMACRO(NL_SETUP_PREFIX_PATHS)
+MACRO(NL_SETUP_BUILD)
+
+  #-----------------------------------------------------------------------------
+  # Setup the buildmode variables.
+  #
+  # None                  = NL_RELEASE_DEBUG
+  # Debug                 = NL_DEBUG
+  # Release               = NL_RELEASE
+  # RelWithDebInfo        = NL_RELEASE_DEBUG
+  # MinSizeRel            = NL_RELEASE_DEBUG
+
+  # None                  = NL_RELEASE
+  # Debug                 = NL_DEBUG
+  # Release               = NL_RELEASE, NL_NO_DEBUG
+  # RelWithDebInfo        = NL_RELEASE
+  # MinSizeRel            = NL_RELEASE, NL_NO_DEBUG
+
+  IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+    SET(NL_BUILD_MODE "NL_DEBUG")
+  ELSE(CMAKE_BUILD_TYPE MATCHES "Debug")
+    IF(CMAKE_BUILD_TYPE MATCHES "Release")
+      SET(NL_BUILD_MODE "NL_RELEASE")
+    ELSE(CMAKE_BUILD_TYPE MATCHES "Release")
+      SET(NL_BUILD_MODE "NL_RELEASE")
+      # enforce release mode if it's neither Debug nor Release
+      SET(CMAKE_BUILD_TYPE "Release")
+    ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
+  ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
+
+  IF(WIN32)
+    SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-")
+    SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF")
+    SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
+  ELSE(WIN32)
+    SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
+    IF(WITH_COVERAGE)
+      SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
+    ENDIF(WITH_COVERAGE)
+    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
+    SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
+    SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
+    SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
+    SET(NL_NONE_CFLAGS "-DNL_RELEASE -g -finline-functions -O2 ")
+  ENDIF(WIN32)
+
+  # Determine host CPU
+  IF(UNIX AND NOT WIN32)
+    FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
+    IF(CMAKE_UNAME)
+      EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
+      SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)")
+      IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        ADD_DEFINITIONS(-DHAVE_X86_64)
+      ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
+        ADD_DEFINITIONS(-DHAVE_IA64)
+      ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        ADD_DEFINITIONS(-DHAVE_X86)
+      ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+    ELSE(CMAKE_UNAME)  # Assume that if uname is not found that we're x86.
+      ADD_DEFINITIONS(-DHAVE_X86)
+    ENDIF(CMAKE_UNAME)
+  ENDIF(UNIX AND NOT WIN32)
+
+ENDMACRO(NL_SETUP_BUILD)
+
+MACRO(NL_SETUP_BUILD_FLAGS)
+  ## None
+  #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
+  #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ")
+
+  ## Debug
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
+
+  ## Release
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
+  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ")
+
+  ## RelWithDebInfo
+  SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
+
+  ## MinSizeRel
+  SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
+  SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
+ENDMACRO(NL_SETUP_BUILD_FLAGS)
+
+MACRO(NL_SETUP_PREFIX_PATHS)
+  ## Allow override of install_prefix/etc path.
+  IF(NOT NL_ETC_PREFIX)
+    IF(WIN32)
+      SET(NL_ETC_PREFIX "../etc" CACHE PATH "Installation path for configurations")
+    ELSE(WIN32)
+      SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Installation path for configurations")
+    ENDIF(WIN32)
+  ENDIF(NOT NL_ETC_PREFIX)
+
+  ## Allow override of install_prefix/share path.
+  IF(NOT NL_SHARE_PREFIX)
+    IF(WIN32)
+	  SET(NL_SHARE_PREFIX "../share" CACHE PATH "Installation path for data.")
+	ELSE(WIN32)
+	  SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Installation path for data.")
+	ENDIF(WIN32)
+  ENDIF(NOT NL_SHARE_PREFIX)
+
+  ## Allow override of install_prefix/sbin path.
+  IF(NOT NL_SBIN_PREFIX)
+	IF(WIN32)
+	  SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.")
+	ELSE(WIN32)
+	  SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.")
+	ENDIF(WIN32)
+  ENDIF(NOT NL_SBIN_PREFIX)
+
+  ## Allow override of install_prefix/bin path.
+  IF(NOT NL_BIN_PREFIX)
+    IF(WIN32)
+		SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.")
+    ELSE(WIN32)
+		SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.")
+    ENDIF(WIN32)
+  ENDIF(NOT NL_BIN_PREFIX)
+
+  ## Allow override of install_prefix/bin path.
+  IF(NOT NL_LOG_PREFIX)
+    IF(WIN32)
+      SET(NL_LOG_PREFIX "../var/log" CACHE PATH "Installation path for tools and applications.")
+    ELSE(WIN32)
+      SET(NL_LOG_PREFIX "${CMAKE_INSTALL_PREFIX}/var/log" CACHE PATH "Installation path for tools and applications.")
+    ENDIF(WIN32)
+  ENDIF(NOT NL_LOG_PREFIX)
+
+ENDMACRO(NL_SETUP_PREFIX_PATHS)
diff --git a/code/ryzom/tools/assoc_mem/CMakeLists.txt b/code/ryzom/tools/assoc_mem/CMakeLists.txt
index 7a16c351d..d1f9ad3a3 100644
--- a/code/ryzom/tools/assoc_mem/CMakeLists.txt
+++ b/code/ryzom/tools/assoc_mem/CMakeLists.txt
@@ -1,5 +1,9 @@
 FILE(GLOB SRC *.cpp *.h)
 
+LIST(REMOVE_ITEM SRC
+  ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ record.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 2\ of\ record.cpp)
+
 ADD_EXECUTABLE(assoc_mem ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
diff --git a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
index 6022510f3..96103031b 100644
--- a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(alias_synchronizer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELLIGO_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/make_alias_file/CMakeLists.txt b/code/ryzom/tools/make_alias_file/CMakeLists.txt
index d5605e1bc..11a7c462e 100644
--- a/code/ryzom/tools/make_alias_file/CMakeLists.txt
+++ b/code/ryzom/tools/make_alias_file/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_alias_file ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
index 42448bb17..e4275c26f 100644
--- a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
+++ b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_anim_by_race ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt b/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt
index 39cd366d5..b20f01b94 100644
--- a/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt
+++ b/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_anim_melee_impact ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_anim_melee_impact ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/patch_gen/CMakeLists.txt b/code/ryzom/tools/patch_gen/CMakeLists.txt
index d81ac467d..4a53f084e 100644
--- a/code/ryzom/tools/patch_gen/CMakeLists.txt
+++ b/code/ryzom/tools/patch_gen/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
 SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 
 ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
 TARGET_LINK_LIBRARIES(patch_gen game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
diff --git a/code/ryzom/tools/pd_parser/CMakeLists.txt b/code/ryzom/tools/pd_parser/CMakeLists.txt
index 7179cc1a1..bf3591e62 100644
--- a/code/ryzom/tools/pd_parser/CMakeLists.txt
+++ b/code/ryzom/tools/pd_parser/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pd_parser ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/pdr_util/CMakeLists.txt b/code/ryzom/tools/pdr_util/CMakeLists.txt
index 5c0a4a9d1..3d27725b7 100644
--- a/code/ryzom/tools/pdr_util/CMakeLists.txt
+++ b/code/ryzom/tools/pdr_util/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pdr_util ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pdr_util game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/skill_extractor/CMakeLists.txt b/code/ryzom/tools/skill_extractor/CMakeLists.txt
index 1c9bd7622..b39730457 100644
--- a/code/ryzom/tools/skill_extractor/CMakeLists.txt
+++ b/code/ryzom/tools/skill_extractor/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(skill_extractor ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/stats_scan/CMakeLists.txt b/code/ryzom/tools/stats_scan/CMakeLists.txt
index 4f967e06c..801048520 100644
--- a/code/ryzom/tools/stats_scan/CMakeLists.txt
+++ b/code/ryzom/tools/stats_scan/CMakeLists.txt
@@ -1,8 +1,10 @@
 FILE(GLOB SRC *.cpp *.h)
 
+LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ char_commands.cpp)
+
 ADD_EXECUTABLE(stats_scan ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(stats_scan game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/translation_tools/CMakeLists.txt b/code/ryzom/tools/translation_tools/CMakeLists.txt
index f876164e2..dd9200d20 100644
--- a/code/ryzom/tools/translation_tools/CMakeLists.txt
+++ b/code/ryzom/tools/translation_tools/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(translation_tools ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELLIGO_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})