Changed: #842 Added more project prefixes to project labels (aka NeL, Ryzom), converted some more Ryzom projects to the new layout.

code/nel/samples/3d/shape_viewer/CMakeLists.txt

@@ -11,7 +11,7 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(nl_sample_shapeview PROPERTIES 
     LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
     LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Samples, 3D: Shape Viewer")
+    PROJECT_LABEL "NeL, Samples, 3D: Shape Viewer")
 ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

code/nel/samples/pacs/CMakeLists.txt

@@ -7,12 +7,12 @@ ADD_DEFINITIONS(-DNL_PACS_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_pacs/\\"")
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_pacs ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nelpacs nel3d)
 IF(WIN32)
-  SET_TARGET_PROPERTIES(nl_sample_pacs PROPERTIES 
+  SET_TARGET_PROPERTIES(nl_sample_pacs PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    LINK_FLAGS "/SUBSYSTEM:WINDOWS"
-    PROJECT_LABEL "Samples: PACS")
 ENDIF(WIN32)
+
+NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS")
+NL_ADD_RUNTIME_FLAGS(nl_sample_pacs)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS nl_sample_pacs RUNTIME DESTINATION bin COMPONENT samplespacs)

code/nel/samples/sound_sources/CMakeLists.txt

@@ -6,12 +6,10 @@ ADD_DEFINITIONS(-DNL_SOUND_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_sound/\\"")
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_sound_sources ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nelsound nelsnd_lowlevel)
-IF(WIN32)
+
-  SET_TARGET_PROPERTIES(nl_sample_sound_sources PROPERTIES 
+NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound System")
-    LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
+NL_ADD_RUNTIME_FLAGS(nl_sample_sound_sources)
-    LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
+
-    PROJECT_LABEL "Samples: Sound System")
-ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS nl_sample_sound_sources RUNTIME DESTINATION bin COMPONENT samplessound)

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

@@ -666,7 +666,7 @@ NL_TARGET_LIB(nel3d ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
-NL_DEFAULT_PROPS(nel3d "Library: NeL 3D")
+NL_DEFAULT_PROPS(nel3d "NeL, Library: 3D")
 NL_ADD_STATIC_VID_DRIVERS(nel3d)
 NL_ADD_LIB_SUFFIX(nel3d)
 

code/nel/src/3d/driver/direct3d/CMakeLists.txt

@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${DXSDK_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d ${LIBXML2_LIBRARIES} ${FREETYPE_LIB} ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
 
-NL_DEFAULT_PROPS(nel_drv_direct3d_win "Driver, Video: Direct3D")
+NL_DEFAULT_PROPS(nel_drv_direct3d_win "NeL, Driver, Video: Direct3D")
 NL_ADD_RUNTIME_FLAGS(nel_drv_direct3d_win)
 NL_ADD_LIB_SUFFIX(nel_drv_direct3d_win)
 

code/nel/src/3d/driver/opengl/CMakeLists.txt

@@ -14,7 +14,7 @@ NL_TARGET_DRIVER(${NLDRV_OGL_LIB} ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES})
-NL_DEFAULT_PROPS(${NLDRV_OGL_LIB} "Driver, Video: OpenGL")
+NL_DEFAULT_PROPS(${NLDRV_OGL_LIB} "NeL, Driver, Video: OpenGL")
 NL_ADD_LIB_SUFFIX(${NLDRV_OGL_LIB})
 NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB})
 

code/nel/src/cegui/CMakeLists.txt

@@ -7,7 +7,7 @@ TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY})
 SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES 
 	VERSION ${NL_VERSION}
 	SOVERSION ${NL_VERSION_MAJOR}
-	PROJECT_LABEL "Library: NeL CEGUI Renderer")
+	PROJECT_LABEL "NeL, Library: CEGUI Renderer")
 
 IF(WIN32)
   SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES 

code/nel/src/georges/CMakeLists.txt

@@ -8,7 +8,7 @@ NL_TARGET_LIB(nelgeorges ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nelgeorges nelmisc)
-NL_DEFAULT_PROPS(nelgeorges "Library: NeL Georges")
+NL_DEFAULT_PROPS(nelgeorges "NeL, Library: Georges")
 
 NL_ADD_LIB_SUFFIX(nelgeorges)
 

code/nel/src/ligo/CMakeLists.txt

@@ -4,7 +4,7 @@ NL_TARGET_LIB(nelligo ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc)
-NL_DEFAULT_PROPS(nelligo "Library: NeL Ligo")
+NL_DEFAULT_PROPS(nelligo "NeL, Library: Ligo")
 
 NL_ADD_LIB_SUFFIX(nelligo)
 

code/nel/src/logic/CMakeLists.txt

@@ -4,7 +4,7 @@ NL_TARGET_LIB(nellogic ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet)
-NL_DEFAULT_PROPS(nellogic "Library: NeL Logic")
+NL_DEFAULT_PROPS(nellogic "NeL, Library: Logic")
 
 NL_ADD_LIB_SUFFIX(nellogic)
 

code/nel/src/misc/CMakeLists.txt

@@ -23,7 +23,7 @@ ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
 TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB})
-NL_DEFAULT_PROPS(nelmisc "Library: NeL Misc")
+NL_DEFAULT_PROPS(nelmisc "NeL, Library: Misc")
 
 NL_ADD_LIB_SUFFIX(nelmisc)
 

code/nel/src/net/CMakeLists.txt

@@ -14,7 +14,7 @@ ENDIF(WITH_GTK)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nelnet ${LIBXML2_LIBRARIES} nelmisc)
-NL_DEFAULT_PROPS(nelnet "Library: NeL Net")
+NL_DEFAULT_PROPS(nelnet "NeL, Library: Net")
 
 NL_ADD_LIB_SUFFIX(nelnet)
 

code/nel/src/pacs/CMakeLists.txt

@@ -4,7 +4,7 @@ NL_TARGET_LIB(nelpacs ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nelpacs ${LIBXML2_LIBRARIES} nelmisc)
-NL_DEFAULT_PROPS(nelpacs "Library: NeL PACS")
+NL_DEFAULT_PROPS(nelpacs "NeL, Library: PACS")
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_ADD_LIB_SUFFIX(nelpacs)

code/nel/src/sound/CMakeLists.txt

@@ -4,7 +4,7 @@ NL_TARGET_LIB(nelsound ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
-NL_DEFAULT_PROPS(nelsound "Library: NeL Sound")
+NL_DEFAULT_PROPS(nelsound "NeL, Library: Sound")
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

code/nel/src/sound/driver/CMakeLists.txt

@@ -4,7 +4,7 @@ nl_target_lib(nelsnd_lowlevel ${SRC})
 
 INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
-nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel")
+nl_default_props(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
 NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel)
 nl_add_lib_suffix(nelsnd_lowlevel)
 

code/nel/src/sound/driver/dsound/CMakeLists.txt

@@ -5,7 +5,7 @@ NL_TARGET_DRIVER(nel_drv_dsound ${SRC})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel_drv_dsound ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSDK_DSOUND_LIBRARY} ${DXSDK_GUID_LIBRARY})
 
-NL_DEFAULT_PROPS(nel_drv_dsound "Driver, Sound: DirectSound")
+NL_DEFAULT_PROPS(nel_drv_dsound "NeL, Driver, Sound: DirectSound")
 NL_ADD_LIB_SUFFIX(nel_drv_dsound)
 NL_ADD_RUNTIME_FLAGS(nel_drv_dsound)
 

code/nel/src/sound/driver/fmod/CMakeLists.txt

@@ -5,7 +5,7 @@ NL_TARGET_DRIVER(nel_drv_fmod ${SRC})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FMOD_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel_drv_fmod ${LIBXML2_LIBRARIES} ${FMOD_LIBRARY} nelsnd_lowlevel)
 
-NL_DEFAULT_PROPS(nel_drv_fmod "Driver, Sound: FMOD")
+NL_DEFAULT_PROPS(nel_drv_fmod "NeL, Driver, Sound: FMOD")
 NL_ADD_LIB_SUFFIX(nel_drv_fmod)
 NL_ADD_RUNTIME_FLAGS(nel_drv_fmod)
 

code/nel/src/sound/driver/openal/CMakeLists.txt

@@ -22,7 +22,7 @@ NL_TARGET_DRIVER(nel_drv_openal ${SRC})
 
 INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel_drv_openal ${OPENAL_LIBRARY} nelmisc nelsnd_lowlevel)
-NL_DEFAULT_PROPS(nel_drv_openal "Driver, Sound: OpenAL")
+NL_DEFAULT_PROPS(nel_drv_openal "NeL, Driver, Sound: OpenAL")
 NL_ADD_LIB_SUFFIX(nel_drv_openal)
 NL_ADD_RUNTIME_FLAGS(nel_drv_openal)
 

code/nel/src/sound/driver/xaudio2/CMakeLists.txt

@@ -31,7 +31,7 @@ NL_TARGET_DRIVER(nel_drv_xaudio2 ${SRC})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel_drv_xaudio2 ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSDK_XAUDIO_LIBRARY} ${DXSDK_GUID_LIBRARY} ${VORBIS_LIBRARIES} ${OGG_LIBRARY})
 
-NL_DEFAULT_PROPS(nel_drv_xaudio2 "Driver, Sound: XAudio2")
+NL_DEFAULT_PROPS(nel_drv_xaudio2 "NeL, Driver, Sound: XAudio2")
 NL_ADD_LIB_SUFFIX(nel_drv_xaudio2)
 NL_ADD_RUNTIME_FLAGS(nel_drv_xaudio2)
 

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(anim_builder ${SRC})
 
 TARGET_LINK_LIBRARIES(anim_builder ${PLATFORM_LINKFLAGS} nelmisc nel3d)
-NL_DEFAULT_PROPS(anim_builder "Tools, 3D: anim_builder")
+NL_DEFAULT_PROPS(anim_builder "NeL, Tools, 3D: anim_builder")
 NL_ADD_RUNTIME_FLAGS(anim_builder)
 
 INSTALL(TARGETS anim_builder RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(animation_set_builder ${SRC})
 
 TARGET_LINK_LIBRARIES(animation_set_builder ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(animation_set_builder "Tools, 3D: anim_set_builder")
+NL_DEFAULT_PROPS(animation_set_builder "NeL, Tools, 3D: anim_set_builder")
 NL_ADD_RUNTIME_FLAGS(animation_set_builder)
 
 INSTALL(TARGETS animation_set_builder RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(build_clod_bank ${SRC})
 
 TARGET_LINK_LIBRARIES(build_clod_bank ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(build_clod_bank "Tools, 3D: build_clod_bank")
+NL_DEFAULT_PROPS(build_clod_bank "NeL, Tools, 3D: build_clod_bank")
 NL_ADD_RUNTIME_FLAGS(build_clod_bank)
 
 INSTALL(TARGETS build_clod_bank RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(build_clodtex ${SRC})
 
 TARGET_LINK_LIBRARIES(build_clodtex ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(build_clodtex "Tools, 3D: build_clodtex")
+NL_DEFAULT_PROPS(build_clodtex "NeL, Tools, 3D: build_clodtex")
 NL_ADD_RUNTIME_FLAGS(build_clodtex)
 
 INSTALL(TARGETS build_clodtex RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(build_coarse_mesh ${SRC})
 
 TARGET_LINK_LIBRARIES(build_coarse_mesh ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(build_coarse_mesh "Tools, 3D: build_coarse_mesh")
+NL_DEFAULT_PROPS(build_coarse_mesh "NeL, Tools, 3D: build_coarse_mesh")
 NL_ADD_RUNTIME_FLAGS(build_coarse_mesh)
 
 INSTALL(TARGETS build_coarse_mesh RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(build_far_bank ${SRC})
 
 TARGET_LINK_LIBRARIES(build_far_bank ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(build_far_bank "Tools, 3D: build_far_bank")
+NL_DEFAULT_PROPS(build_far_bank "NeL, Tools, 3D: build_far_bank")
 NL_ADD_RUNTIME_FLAGS(build_far_bank)
 
 INSTALL(TARGETS build_far_bank RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(build_interface ${SRC})
 
 TARGET_LINK_LIBRARIES(build_interface ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(build_interface "Tools, 3D: build_interface")
+NL_DEFAULT_PROPS(build_interface "NeL, Tools, 3D: build_interface")
 NL_ADD_RUNTIME_FLAGS(build_interface)
 
 INSTALL(TARGETS build_interface RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(build_shadow_skin ${SRC})
 
 TARGET_LINK_LIBRARIES(build_shadow_skin ${PLATFORM_LINKFLAGS} nel3d)
-NL_DEFAULT_PROPS(build_shadow_skin "Tools, 3D: build_shadow_skin")
+NL_DEFAULT_PROPS(build_shadow_skin "NeL, Tools, 3D: build_shadow_skin")
 NL_ADD_RUNTIME_FLAGS(build_shadow_skin)
 
 INSTALL(TARGETS build_shadow_skin RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(build_smallbank ${SRC})
 
 TARGET_LINK_LIBRARIES(build_smallbank ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(build_smallbank "Tools, 3D: build_smallbank")
+NL_DEFAULT_PROPS(build_smallbank "NeL, Tools, 3D: build_smallbank")
 NL_ADD_RUNTIME_FLAGS(build_smallbank)
 
 INSTALL(TARGETS build_smallbank RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(cluster_viewer WIN32 ${SRC})
 
 TARGET_LINK_LIBRARIES(cluster_viewer ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(cluster_viewer "Tools, 3D: Cluster Viewer")
+NL_DEFAULT_PROPS(cluster_viewer "NeL, Tools, 3D: Cluster Viewer")
 NL_ADD_RUNTIME_FLAGS(cluster_viewer)
 
 INSTALL(TARGETS cluster_viewer RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(file_info ${SRC})
 
 TARGET_LINK_LIBRARIES(file_info ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(file_info "Tools, 3D: file_info")
+NL_DEFAULT_PROPS(file_info "NeL, Tools, 3D: file_info")
 NL_ADD_RUNTIME_FLAGS(file_info)
 
 INSTALL(TARGETS file_info RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(get_neighbors ${SRC})
 
 TARGET_LINK_LIBRARIES(get_neighbors ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(get_neighbors "Tools, 3D: get_neighbors")
+NL_DEFAULT_PROPS(get_neighbors "NeL, Tools, 3D: get_neighbors")
 NL_ADD_RUNTIME_FLAGS(get_neighbors)
 
 INSTALL(TARGETS get_neighbors RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(ig_add ${SRC})
 
 TARGET_LINK_LIBRARIES(ig_add ${PLATFORM_LINKFLAGS} nel3d)
-NL_DEFAULT_PROPS(ig_add "Tools, 3D: ig_add")
+NL_DEFAULT_PROPS(ig_add "NeL, Tools, 3D: ig_add")
 NL_ADD_RUNTIME_FLAGS(ig_add)
 
 INSTALL(TARGETS ig_add RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(ig_info ${SRC})
 
 TARGET_LINK_LIBRARIES(ig_info ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(ig_info "Tools, 3D: ig_info")
+NL_DEFAULT_PROPS(ig_info "NeL, Tools, 3D: ig_info")
 NL_ADD_RUNTIME_FLAGS(ig_info)
 
 INSTALL(TARGETS ig_info RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h)
 ADD_EXECUTABLE(ig_lighter ${SRC})
 
 TARGET_LINK_LIBRARIES(ig_lighter ${PLATFORM_LINKFLAGS} nel3d nelpacs)
-NL_DEFAULT_PROPS(ig_lighter "Tools, 3D: ig_lighter")
+NL_DEFAULT_PROPS(ig_lighter "NeL, Tools, 3D: ig_lighter")
 NL_ADD_RUNTIME_FLAGS(ig_lighter)
 
 INSTALL(TARGETS ig_lighter RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -24,7 +24,7 @@ SET_TARGET_PROPERTIES(object_viewer_dll PROPERTIES
   LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
   DEBUG_POSTFIX "_d"
   RELEASE_POSTFIX "_r"
-  PROJECT_LABEL "Tools, 3D: Object Viewer DLL")
+  PROJECT_LABEL "NeL, Tools, 3D: Object Viewer DLL")
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
 

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

@@ -19,7 +19,7 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 SET_TARGET_PROPERTIES(object_viewer PROPERTIES 
   LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
   LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-  PROJECT_LABEL "Tools, 3D: Object Viewer")
+  PROJECT_LABEL "NeL, Tools, 3D: Object Viewer")
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(object_viewer ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)

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

@@ -10,7 +10,7 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(panoply_maker PROPERTIES 
     LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
     LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, 3D: panoply_maker")
+    PROJECT_LABEL "NeL, Tools, 3D: panoply_maker")
 ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(tga_cut ${SRC})
 
 TARGET_LINK_LIBRARIES(tga_cut ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(tga_cut "Tools, 3D: tga_cut")
+NL_DEFAULT_PROPS(tga_cut "NeL, Tools, 3D: tga_cut")
 NL_ADD_RUNTIME_FLAGS(tga_cut)
 
 INSTALL(TARGETS tga_cut RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(tga_resize ${SRC})
 
 TARGET_LINK_LIBRARIES(tga_resize ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(tga_resize "Tools, 3D: tga_resize")
+NL_DEFAULT_PROPS(tga_resize "NeL, Tools, 3D: tga_resize")
 NL_ADD_RUNTIME_FLAGS(tga_resize)
 
 INSTALL(TARGETS tga_resize RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -17,7 +17,7 @@ IF(WIN32)
     LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
     LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
     EXCLUDE_FROM_DEFAULT_BUILD 1
-    PROJECT_LABEL "Tools, 3D: Tile Editor")
+    PROJECT_LABEL "NeL, Tools, 3D: Tile Editor")
 ENDIF(WIN32)
 
 #INSTALL(TARGETS tile_edit RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(zone_check_bind ${SRC})
 
 TARGET_LINK_LIBRARIES(zone_check_bind ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(zone_check_bind "Tools, 3D: zone_check_bind")
+NL_DEFAULT_PROPS(zone_check_bind "NeL, Tools, 3D: zone_check_bind")
 NL_ADD_RUNTIME_FLAGS(zone_check_bind)
 
 INSTALL(TARGETS zone_check_bind RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 ADD_EXECUTABLE(zone_dependencies ${SRC})
 
 TARGET_LINK_LIBRARIES(zone_dependencies ${PLATFORM_LINKFLAGS} nel3d nelgeorges nelmisc)
-NL_DEFAULT_PROPS(zone_dependencies "Tools, 3D: zone_dependencies")
+NL_DEFAULT_PROPS(zone_dependencies "NeL, Tools, 3D: zone_dependencies")
 NL_ADD_RUNTIME_FLAGS(zone_dependencies)
 
 INSTALL(TARGETS zone_dependencies RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 ADD_EXECUTABLE(zone_dump ${SRC})
 
 TARGET_LINK_LIBRARIES(zone_dump ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(zone_dump "Tools, 3D: zone_dump")
+NL_DEFAULT_PROPS(zone_dump "NeL, Tools, 3D: zone_dump")
 NL_ADD_RUNTIME_FLAGS(zone_dump)
 
 INSTALL(TARGETS zone_dump RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -8,7 +8,7 @@ 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")
+    PROJECT_LABEL "NeL, Tools, 3D: zone_ig_lighter")
 ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 ADD_EXECUTABLE(zone_lighter ${SRC})
 
 TARGET_LINK_LIBRARIES(zone_lighter ${PLATFORM_LINKFLAGS} nel3d nelgeorges nelmisc)
-NL_DEFAULT_PROPS(zone_lighter "Tools, 3D: zone_lighter")
+NL_DEFAULT_PROPS(zone_lighter "NeL, Tools, 3D: zone_lighter")
 NL_ADD_RUNTIME_FLAGS(zone_lighter)
 
 INSTALL(TARGETS zone_lighter RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
 ADD_EXECUTABLE(zone_welder ${SRC})
 
 TARGET_LINK_LIBRARIES(zone_welder ${PLATFORM_LINKFLAGS} nel3d nelmisc)
-NL_DEFAULT_PROPS(zone_welder "Tools, 3D: zone_welder")
+NL_DEFAULT_PROPS(zone_welder "NeL, Tools, 3D: zone_welder")
 NL_ADD_RUNTIME_FLAGS(zone_welder)
 
 INSTALL(TARGETS zone_welder RUNTIME DESTINATION bin COMPONENT tools3d)

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

@@ -9,7 +9,7 @@ ENDIF(WIN32)
 ADD_DEFINITIONS(-DNL_ZVIEWER_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 TARGET_LINK_LIBRARIES(zviewer ${PLATFORM_LINKFLAGS} nel3d)
-NL_DEFAULT_PROPS(zviewer "Tools, 3D: Zone Viewer")
+NL_DEFAULT_PROPS(zviewer "NeL, Tools, 3D: Zone Viewer")
 NL_ADD_RUNTIME_FLAGS(zviewer)
 
 INSTALL(TARGETS zviewer RUNTIME DESTINATION bin COMPONENT tools3d)

code/nel/tools/georges/georges2csv/CMakeLists.txt

@@ -4,7 +4,7 @@ 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_DEFAULT_PROPS(georges2csv "NeL, Tools, Georges: georges2csv")
 NL_ADD_RUNTIME_FLAGS(georges2csv)
 
 INSTALL(TARGETS georges2csv RUNTIME DESTINATION bin COMPONENT toolsgeorges)

code/nel/tools/logic/logic_editor_dll/CMakeLists.txt

@@ -13,7 +13,7 @@ SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES
   SOVERSION ${NL_VERSION_MAJOR}
   DEBUG_POSTFIX "_d"
   RELEASE_POSTFIX "_r"
-  PROJECT_LABEL "Tools, Logic: Logic Editor DLL")
+  PROJECT_LABEL "NeL, Tools, Logic: Logic Editor DLL")
 
 IF(WIN32)
   SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES

code/nel/tools/logic/logic_editor_exe/CMakeLists.txt

@@ -10,7 +10,7 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(logic_editor PROPERTIES 
     LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
     LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-    PROJECT_LABEL "Tools, Logic: Logic Editor")
+    PROJECT_LABEL "NeL, Tools, Logic: Logic Editor")
 ENDIF(WIN32)
 
 IF(WITH_PCH)

code/nel/tools/misc/bnp_make/CMakeLists.txt

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(bnp_make ${SRC})
 
 TARGET_LINK_LIBRARIES(bnp_make ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(bnp_make "Tools, Misc: bnp_make")
+NL_DEFAULT_PROPS(bnp_make "NeL, Tools, Misc: bnp_make")
 NL_ADD_RUNTIME_FLAGS(bnp_make)
 
 INSTALL(TARGETS bnp_make RUNTIME DESTINATION bin COMPONENT toolsmisc)

code/nel/tools/misc/disp_sheet_id/CMakeLists.txt

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(disp_sheet_id ${SRC})
 
 TARGET_LINK_LIBRARIES(disp_sheet_id ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(disp_sheet_id "Tools, Misc: disp_sheet_id")
+NL_DEFAULT_PROPS(disp_sheet_id "NeL, Tools, Misc: disp_sheet_id")
 NL_ADD_RUNTIME_FLAGS(disp_sheet_id)
 
 INSTALL(TARGETS disp_sheet_id RUNTIME DESTINATION bin COMPONENT toolsmisc)

code/nel/tools/misc/make_sheet_id/CMakeLists.txt

@@ -5,7 +5,7 @@ ADD_EXECUTABLE(make_sheet_id ${SRC})
 ADD_DEFINITIONS(-DNL_MK_SH_ID_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 TARGET_LINK_LIBRARIES(make_sheet_id ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(make_sheet_id "Tools, Misc: make_sheet_id")
+NL_DEFAULT_PROPS(make_sheet_id "NeL, Tools, Misc: make_sheet_id")
 NL_ADD_RUNTIME_FLAGS(make_sheet_id)
 
 INSTALL(TARGETS make_sheet_id RUNTIME DESTINATION bin COMPONENT toolsmisc)

code/nel/tools/misc/xml_packer/CMakeLists.txt

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(xml_packer ${SRC})
 
 TARGET_LINK_LIBRARIES(xml_packer ${PLATFORM_LINKFLAGS} nelmisc)
-NL_DEFAULT_PROPS(xml_packer "Tools, Misc: xml_packer")
+NL_DEFAULT_PROPS(xml_packer "NeL, Tools, Misc: xml_packer")
 NL_ADD_RUNTIME_FLAGS(xml_packer)
 
 INSTALL(TARGETS xml_packer RUNTIME DESTINATION bin COMPONENT toolsmisc)

code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt

@@ -5,7 +5,7 @@ ADD_EXECUTABLE(build_ig_boxes ${SRC})
 ADD_DEFINITIONS(-DNL_BIB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 TARGET_LINK_LIBRARIES(build_ig_boxes ${PLATFORM_LINKFLAGS} nelpacs nel3d)
-NL_DEFAULT_PROPS(build_ig_boxes "Tools, PACS: build_ig_boxes")
+NL_DEFAULT_PROPS(build_ig_boxes "NeL, Tools, PACS: build_ig_boxes")
 NL_ADD_RUNTIME_FLAGS(build_ig_boxes)
 
 INSTALL(TARGETS build_ig_boxes RUNTIME DESTINATION bin COMPONENT toolspacs)

code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt

@@ -5,7 +5,7 @@ ADD_EXECUTABLE(build_indoor_rbank ${SRC})
 ADD_DEFINITIONS(-DNL_BIRB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 TARGET_LINK_LIBRARIES(build_indoor_rbank ${PLATFORM_LINKFLAGS} nelpacs)
-NL_DEFAULT_PROPS(build_indoor_rbank "Tools, PACS: build_indoor_rbank")
+NL_DEFAULT_PROPS(build_indoor_rbank "NeL, Tools, PACS: build_indoor_rbank")
 NL_ADD_RUNTIME_FLAGS(build_indoor_rbank)
 
 INSTALL(TARGETS build_indoor_rbank RUNTIME DESTINATION bin COMPONENT toolspacs)

code/nel/tools/pacs/build_rbank/CMakeLists.txt

@@ -7,7 +7,7 @@ ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(build_rbank ${PLATFORM_LINKFLAGS} nelpacs nel3d nelligo nelmisc)
-NL_DEFAULT_PROPS(build_rbank "Tools, PACS: build_rbank")
+NL_DEFAULT_PROPS(build_rbank "NeL, Tools, PACS: build_rbank")
 NL_ADD_RUNTIME_FLAGS(build_rbank)
 
 INSTALL(TARGETS build_rbank RUNTIME DESTINATION bin COMPONENT toolspacs)

code/ryzom/server/CMakeLists.txt

@@ -1 +1,3 @@
+SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
 ADD_SUBDIRECTORY(src)

code/ryzom/server/src/ai_service/CMakeLists.txt

@@ -12,12 +12,9 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_interface.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_interface.h)
 
-ADD_EXECUTABLE(ai_service ${SRC})
+ADD_EXECUTABLE(ai_service WIN32 ${SRC})
 
-
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-
-
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(ai_service	admin_modules 
 					ryzom_gameshare 
 					server_share
@@ -26,15 +23,13 @@ TARGET_LINK_LIBRARIES(ai_service	admin_modules
 					${LIBXML2_LIBRARIES} 
 					${MYSQL_LIBRARIES} 
 					${ZLIB_LIBRARIES} 
-					${NELMISC_LIBRARY} 
+					nelmisc
-					${NELNET_LIBRARY} 
+					nelnet
-					${NELGEORGES_LIBRARY} 
+					nelgeorges
-					${NELLIGO_LIBRARY})
+					nelligo)
-IF(WIN32)
+
-  SET_TARGET_PROPERTIES(ai_service PROPERTIES 
+NL_DEFAULT_PROPS(ai_service "Ryzom, Services: AI Service (AIS)")
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
+NL_ADD_RUNTIME_FLAGS(ai_service)
-	PROJECT_LABEL "Services: AI Service (AIS)")
-ENDIF(WIN32)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

code/ryzom/server/src/backup_service/CMakeLists.txt

@@ -1,23 +1,22 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(backup_service ${SRC})
+ADD_EXECUTABLE(backup_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(backup_service	admin_modules 
 					ryzom_gameshare 
 					server_share
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
 					${ZLIB_LIBRARIES} 
-					${NELMISC_LIBRARY} 
+					nelmisc 
-					${NELNET_LIBRARY} 
+					nelnet
-					${NELGEORGES_LIBRARY} 
+					nelgeorges
-					${NELLIGO_LIBRARY})
+					nelligo)
-IF(WIN32)
+					
-  SET_TARGET_PROPERTIES(backup_service PROPERTIES 
+NL_DEFAULT_PROPS(backup_service "Ryzom, Services: Backup Service (BS)")
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
+NL_ADD_RUNTIME_FLAGS(backup_service)
-	PROJECT_LABEL "Services: Backup Service (BS)")
+
-ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS backup_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt

@@ -2,9 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOURCE_DIR}/service.h)
 
-ADD_EXECUTABLE(dynamic_scenario_service ${SRC})
+ADD_EXECUTABLE(dynamic_scenario_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(dynamic_scenario_service	admin_modules 
 						ryzom_gameshare 
 						server_share
@@ -12,15 +12,14 @@ TARGET_LINK_LIBRARIES(dynamic_scenario_service	admin_modules
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						${ZLIB_LIBRARIES} 
-						${NELMISC_LIBRARY} 
+						nelmisc 
-						${NELNET_LIBRARY} 
+						nelnet
-						${NELGEORGES_LIBRARY} 
+						nelgeorges
-						${NELLIGO_LIBRARY})
+						nelligo)
-IF(WIN32)
+
-  SET_TARGET_PROPERTIES(dynamic_scenario_service PROPERTIES 
+NL_DEFAULT_PROPS(dynamic_scenario_service "Ryzom, Services: Dynamic Scenario Service (DSS)")
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
+NL_ADD_RUNTIME_FLAGS(dynamic_scenario_service)
-	PROJECT_LABEL "Services: Dynamic Scenario Service (DSS)")
+
-ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS dynamic_scenario_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/server/src/entities_game_service/CMakeLists.txt

@@ -40,9 +40,9 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.h)
 
-ADD_EXECUTABLE(entities_game_service ${SRC})
+ADD_EXECUTABLE(entities_game_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(entities_game_service	admin_modules 
 						ryzom_gameshare 
 						server_share 
@@ -53,16 +53,14 @@ TARGET_LINK_LIBRARIES(entities_game_service	admin_modules
 						${LIBXML2_LIBRARIES} 
 						${MYSQL_LIBRARIES} 
 						${ZLIB_LIBRARIES} 
-						${NELMISC_LIBRARY} 
+						nelmisc
-						${NELNET_LIBRARY} 
+						nelnet
-						${NELGEORGES_LIBRARY} 
+						nelgeorges
-						${NELLIGO_LIBRARY})
+						nelligo)
+
+NL_DEFAULT_PROPS(entities_game_service "Ryzom, Services: Entities Game Service (EGS)")
+NL_ADD_RUNTIME_FLAGS(entities_game_service)
 
-IF(WIN32)
-  SET_TARGET_PROPERTIES(entities_game_service PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: Entities Game Service (EGS)")
-ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)

code/ryzom/server/src/frontend_service/CMakeLists.txt

@@ -7,15 +7,13 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/pair_selector.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.h)
 
-ADD_EXECUTABLE(frontend_service ${SRC})
+ADD_EXECUTABLE(frontend_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(frontend_service admin_modules ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY})
+TARGET_LINK_LIBRARIES(frontend_service admin_modules ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges nelligo)
-IF(WIN32)
+
-  SET_TARGET_PROPERTIES(frontend_service PROPERTIES 
+NL_DEFAULT_PROPS(frontend_service "Ryzom, Services: Frontend Service (FS)")
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
+NL_ADD_RUNTIME_FLAGS(frontend_service)
-	PROJECT_LABEL "Services: Frontend Service (FS)")
-ENDIF(WIN32)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

code/ryzom/tools/client/client_patcher/CMakeLists.txt

@@ -25,8 +25,8 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher 	${PLATFORM_LINKFLAGS}
 
 ADD_DEFINITIONS(-DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
 
-NL_DEFAULT_PROPS(ryzom_client "Ryzom, Tools: Ryzom Client Patcher")
+NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")
-NL_ADD_RUNTIME_FLAGS(ryzom_client)
+NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/client/src/stdpch.cpp)

code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(alias_synchronizer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY})
+TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelligo)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(alias_synchronizer "Ryzom, Tools, Misc: Alias Synchronizer")
+NL_ADD_RUNTIME_FLAGS(alias_synchronizer)
+
 INSTALL(TARGETS alias_synchronizer RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(csv_transform ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(csv_transform "Ryzom, Tools, Misc: CSV Transform")
+NL_ADD_RUNTIME_FLAGS(csv_transform)
+
 INSTALL(TARGETS csv_transform RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt

@@ -2,13 +2,17 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(prim_export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(prim_export	${NELMISC_LIBRARY}
+TARGET_LINK_LIBRARIES(prim_export	
-					${NELLIGO_LIBRARY}
+					nelmisc
-					${NEL3D_LIBRARY}
+					nelligo
-					${NELGEORGES_LIBRARY}
+					nel3d
+					nelgeorges
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(prim_export "Ryzom, Tools, World: Primitive Export")
+NL_ADD_RUNTIME_FLAGS(prim_export)
+
 INSTALL(TARGETS prim_export RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(uni_conv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(uni_conv ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+TARGET_LINK_LIBRARIES(uni_conv ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
+NL_DEFAULT_PROPS(uni_conv "Ryzom, Tools, Misc: Unicode Conversion Tool")
+NL_ADD_RUNTIME_FLAGS(uni_conv)
 
 INSTALL(TARGETS uni_conv RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/make_alias_file/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_alias_file ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
+TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(make_alias_file "Ryzom, Tools, Misc: Make Alias File")
+NL_ADD_RUNTIME_FLAGS(make_alias_file)
+
 INSTALL(TARGETS make_alias_file RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/make_anim_by_race/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_anim_by_race ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(make_anim_by_race "Ryzom, Tools, Misc: Make Anim By Race")
+NL_ADD_RUNTIME_FLAGS(make_anim_by_race)
+
 INSTALL(TARGETS make_anim_by_race RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt

@@ -6,4 +6,7 @@ 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})
 
+NL_DEFAULT_PROPS(make_anim_melee_impact "Ryzom, Tools, Misc: Make Anim Melee Impact")
+NL_ADD_RUNTIME_FLAGS(make_anim_melee_impact)
+
 INSTALL(TARGETS make_anim_melee_impact RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/patch_gen/CMakeLists.txt

@@ -1,13 +1,19 @@
 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_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
 ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
-TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
+TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges)
 
 ADD_EXECUTABLE(patch_gen_service ${SERVICE_SRC})
-TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
+TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeogres)
+
+NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator")
+NL_ADD_RUNTIME_FLAGS(patch_gen_service)
+
+NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator Service")
+NL_ADD_RUNTIME_FLAGS(patch_gen)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

code/ryzom/tools/pd_parser/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pd_parser ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(pd_parser "Ryzom, Tools: PD Parser")
+NL_ADD_RUNTIME_FLAGS(pd_parser)
+
 INSTALL(TARGETS pd_parser RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/pdr_util/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pdr_util ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
+TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(pdr_util "Ryzom, Tools: PDR Utility")
+NL_ADD_RUNTIME_FLAGS(pdr_util)
+
 INSTALL(TARGETS pdr_util RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/skill_extractor/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(skill_extractor ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(skill_extractor "Ryzom, Tools, Misc: Skill Extractor")
+NL_ADD_RUNTIME_FLAGS(skill_extractor)
+
 INSTALL(TARGETS skill_extractor RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/stats_scan/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(stats_scan ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
+TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(stats_scan "Ryzom, Tools, Misc: Stats Scan")
+NL_ADD_RUNTIME_FLAGS(stats_scan)
+
 INSTALL(TARGETS stats_scan RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/translation_tools/CMakeLists.txt

@@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(translation_tools ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
+TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+NL_DEFAULT_PROPS(translation_tools "Ryzom, Tools, Misc: Translation Tools")
+NL_ADD_RUNTIME_FLAGS(translation_tools)
+
 INSTALL(TARGETS translation_tools RUNTIME DESTINATION bin COMPONENT tools)