diff --git a/code/nel/samples/georges/CMakeLists.txt b/code/nel/samples/georges/CMakeLists.txt
index ed83e9ce3..29553dbfe 100644
--- a/code/nel/samples/georges/CMakeLists.txt
+++ b/code/nel/samples/georges/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_georges ${SRC})
 
-ADD_DEFINITIONS(-DGF_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_georges/\\"")
+ADD_DEFINITIONS(-DGF_DIR="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_georges_config/")
 
 TARGET_LINK_LIBRARIES(nl_sample_georges nelgeorges nelmisc)
 NL_DEFAULT_PROPS(nl_sample_georges "NeL, Samples: Georges")
@@ -10,4 +10,4 @@ NL_ADD_RUNTIME_FLAGS(nl_sample_georges)
 
 INSTALL(TARGETS nl_sample_georges RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesgeorges)
 INSTALL(FILES boolean.typ coolfilesinfo.dfn default.sample_config int.typ positiondata.dfn sample_config.dfn string.typ sheet_id.bin
-	DESTINATION ${NL_SHARE_PREFIX}/nl_sample_georges/ COMPONENT samplesgeorges)
+	DESTINATION ${NL_SHARE_PREFIX}/nl_sample_georges_config/ COMPONENT samplesgeorges)
diff --git a/code/nel/samples/misc/configfile/CMakeLists.txt b/code/nel/samples/misc/configfile/CMakeLists.txt
index 3d29c082c..d1ace8d85 100644
--- a/code/nel/samples/misc/configfile/CMakeLists.txt
+++ b/code/nel/samples/misc/configfile/CMakeLists.txt
@@ -2,11 +2,11 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_configfile ${SRC})
 
-ADD_DEFINITIONS(-DNL_SAMPLE_CFG="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_configfile/\\"")
+ADD_DEFINITIONS(-DNL_SAMPLE_CFG="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_configfile_config/")
 
 TARGET_LINK_LIBRARIES(nl_sample_configfile nelmisc)
 NL_DEFAULT_PROPS(nl_sample_configfile "NeL, Samples, Misc: Config Files")
 NL_ADD_RUNTIME_FLAGS(nl_sample_configfile)
 
 INSTALL(TARGETS nl_sample_configfile RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesmisc)
-INSTALL(FILES simpletest.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_configfile COMPONENT samplesmisc)
+INSTALL(FILES simpletest.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_configfile_config COMPONENT samplesmisc)
diff --git a/code/nel/samples/misc/i18n/CMakeLists.txt b/code/nel/samples/misc/i18n/CMakeLists.txt
index 5238b6180..2a2aa0f90 100644
--- a/code/nel/samples/misc/i18n/CMakeLists.txt
+++ b/code/nel/samples/misc/i18n/CMakeLists.txt
@@ -2,11 +2,11 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_i18n ${SRC})
 
-ADD_DEFINITIONS(-DNL_LANG_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_i18n/\\"")
+ADD_DEFINITIONS(-DNL_LANG_DATA="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_i18n_config/")
 
 TARGET_LINK_LIBRARIES(nl_sample_i18n nelmisc)
 NL_DEFAULT_PROPS(nl_sample_i18n "NeL, Samples, Misc: I18N")
 NL_ADD_RUNTIME_FLAGS(nl_sample_i18n)
 
 INSTALL(TARGETS nl_sample_i18n RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesmisc)
-INSTALL(FILES de.uxt en.uxt fr.uxt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_i18n COMPONENT samplesmisc)
+INSTALL(FILES de.uxt en.uxt fr.uxt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_i18n_config COMPONENT samplesmisc)
diff --git a/code/nel/samples/net/CMakeLists.txt b/code/nel/samples/net/CMakeLists.txt
index 213e02be5..a5173fb0f 100644
--- a/code/nel/samples/net/CMakeLists.txt
+++ b/code/nel/samples/net/CMakeLists.txt
@@ -1,8 +1,6 @@
 ADD_SUBDIRECTORY(chat)
 
-IF(WITH_3D)
-  ADD_SUBDIRECTORY(udp)
-ENDIF()
+ADD_SUBDIRECTORY(udp)
 
 ADD_SUBDIRECTORY(login_system)
 ADD_SUBDIRECTORY(class_transport)
diff --git a/code/nel/samples/net/udp/CMakeLists.txt b/code/nel/samples/net/udp/CMakeLists.txt
index 21ef87015..6317017ad 100644
--- a/code/nel/samples/net/udp/CMakeLists.txt
+++ b/code/nel/samples/net/udp/CMakeLists.txt
@@ -4,13 +4,15 @@ ADD_EXECUTABLE(nl_sample_udpclient client.cpp graph.cpp graph.h simlag.cpp simla
 
 ADD_EXECUTABLE(nl_sample_udpserver WIN32 bench_service.cpp receive_task.cpp receive_task.h)
 
-ADD_DEFINITIONS(-DUDP_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/\\"")
+ADD_DEFINITIONS(-DUDP_DIR="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/")
 
 IF(WITH_3D)
   ADD_DEFINITIONS(-DUSE_3D)
+  TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet nel3d)
+ELSE()
+  TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet)
 ENDIF()
 
-TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet nel3d)
 TARGET_LINK_LIBRARIES(nl_sample_udpserver nelmisc nelnet)
 NL_DEFAULT_PROPS(nl_sample_udpclient "NeL, Samples, Net, UDP: UDP Client")
 NL_DEFAULT_PROPS(nl_sample_udpserver "NeL, Samples, Net, UDP: UDP Server")
diff --git a/code/nel/samples/pacs/CMakeLists.txt b/code/nel/samples/pacs/CMakeLists.txt
index 79839c126..d43e3928a 100644
--- a/code/nel/samples/pacs/CMakeLists.txt
+++ b/code/nel/samples/pacs/CMakeLists.txt
@@ -2,16 +2,16 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_pacs WIN32 ${SRC})
 
-ADD_DEFINITIONS(-DNL_PACS_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_pacs/\\"")
+ADD_DEFINITIONS(-DNL_PACS_DATA="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_pacs_config/")
 
 TARGET_LINK_LIBRARIES(nl_sample_pacs nelmisc nelpacs nel3d)
 NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS")
 NL_ADD_RUNTIME_FLAGS(nl_sample_pacs)
 
 INSTALL(TARGETS nl_sample_pacs RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplespacs)
-INSTALL(FILES readme.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs COMPONENT samplespacs)
+INSTALL(FILES readme.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs_config COMPONENT samplespacs)
 INSTALL(DIRECTORY shapes/
-	DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs/shapes
+	DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs_config/shapes
 	COMPONENT samplespacs
 	PATTERN "CVS" EXCLUDE
 	PATTERN ".svn" EXCLUDE