diff --git a/code/ryzom/client/src/client_sheets/CMakeLists.txt b/code/ryzom/client/src/client_sheets/CMakeLists.txt
index 541fd6852..1479ca6cd 100644
--- a/code/ryzom/client/src/client_sheets/CMakeLists.txt
+++ b/code/ryzom/client/src/client_sheets/CMakeLists.txt
@@ -21,7 +21,7 @@ IF(WIN32)
 		PROJECT_LABEL "Library: Client Sheets"
 		DEBUG_POSTFIX "_d"
 		RELEASE_POSTFIX "_r"
-		LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt"
+		LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt")
 ENDIF(WIN32)
 
 INSTALL(TARGETS ryzom_clientsheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt
index a9f1ec401..2f2beb609 100644
--- a/code/ryzom/common/src/game_share/CMakeLists.txt
+++ b/code/ryzom/common/src/game_share/CMakeLists.txt
@@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES VERSION ${NL_VERSION})
 IF(WIN32)
 #  SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
 #  SET_SOURCE_FILES_PROPERTIES(stdgeorges.cpp PROPERTIES COMPILE_FLAGS "/Ycstdgeorges.h")
-  SET_TARGET_PROPERTIES(game_share 
+  SET_TARGET_PROPERTIES(ryzom_gameshare 
 		PROJECT_LABEL "Library: Game Share"
 		DEBUG_POSTFIX "_d"
 		RELEASE_POSTFIX "_r"
diff --git a/code/ryzom/server/src/ai_service/CMakeLists.txt b/code/ryzom/server/src/ai_service/CMakeLists.txt
index 95cb5dc35..f684324ea 100644
--- a/code/ryzom/server/src/ai_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_service/CMakeLists.txt
@@ -22,7 +22,7 @@ ADD_EXECUTABLE(ai_service ${SRC})
 
 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 
-					game_share 
+					ryzom_gameshare 
 					server_share
 					ai_share
 					${PLATFORM_LINKFLAGS} 
diff --git a/code/ryzom/server/src/ai_share/CMakeLists.txt b/code/ryzom/server/src/ai_share/CMakeLists.txt
index c5443f3ed..99d15cef4 100644
--- a/code/ryzom/server/src/ai_share/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_share/CMakeLists.txt
@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_LIBRARY(ai_share STATIC ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ai_share	game_share
+TARGET_LINK_LIBRARIES(ai_share	ryzom_gameshare
 				server_share
 				${NELMISC_LIBRARY} 
 				${NELNET_LIBRARY} 
diff --git a/code/ryzom/server/src/backup_service/CMakeLists.txt b/code/ryzom/server/src/backup_service/CMakeLists.txt
index 812eda357..515ec7735 100644
--- a/code/ryzom/server/src/backup_service/CMakeLists.txt
+++ b/code/ryzom/server/src/backup_service/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(backup_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(backup_service	admin_modules 
-					game_share 
+					ryzom_gameshare 
 					server_share
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
diff --git a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
index 62066c005..081b37b50 100644
--- a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
+++ b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
@@ -6,7 +6,7 @@ ADD_EXECUTABLE(dynamic_scenario_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(dynamic_scenario_service	admin_modules 
-						game_share 
+						ryzom_gameshare 
 						server_share
 						ai_share
 						${PLATFORM_LINKFLAGS} 
diff --git a/code/ryzom/server/src/entities_game_service/CMakeLists.txt b/code/ryzom/server/src/entities_game_service/CMakeLists.txt
index ebda0556a..418b1af7f 100644
--- a/code/ryzom/server/src/entities_game_service/CMakeLists.txt
+++ b/code/ryzom/server/src/entities_game_service/CMakeLists.txt
@@ -44,7 +44,7 @@ ADD_EXECUTABLE(entities_game_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(entities_game_service	admin_modules 
-						game_share 
+						ryzom_gameshare 
 						server_share 
 						ai_share 
 						pd_lib 
diff --git a/code/ryzom/server/src/entity_view_service/CMakeLists.txt b/code/ryzom/server/src/entity_view_service/CMakeLists.txt
index 1908bac4c..21f4fcb9c 100644
--- a/code/ryzom/server/src/entity_view_service/CMakeLists.txt
+++ b/code/ryzom/server/src/entity_view_service/CMakeLists.txt
@@ -6,7 +6,7 @@ ADD_EXECUTABLE(entity_view_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(entity_view_service	admin_modules 
-						game_share 
+						ryzom_gameshare 
 						server_share
 						ai_share
 						${PLATFORM_LINKFLAGS} 
diff --git a/code/ryzom/server/src/frontend_service/CMakeLists.txt b/code/ryzom/server/src/frontend_service/CMakeLists.txt
index 09dec7da8..94073d7c0 100644
--- a/code/ryzom/server/src/frontend_service/CMakeLists.txt
+++ b/code/ryzom/server/src/frontend_service/CMakeLists.txt
@@ -13,7 +13,7 @@ ADD_EXECUTABLE(frontend_service ${SRC})
 
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(frontend_service admin_modules game_share ${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_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY})
 IF(WIN32)
   SET_TARGET_PROPERTIES(frontend_service PROPERTIES 
 	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
diff --git a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
index 8749da323..9b913f5e8 100644
--- a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
+++ b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
@@ -17,7 +17,7 @@ ADD_EXECUTABLE(general_utilities_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(general_utilities_service	admin_modules 
-						game_share 
+						ryzom_gameshare 
 						server_share
 						ai_share
 						${PLATFORM_LINKFLAGS} 
diff --git a/code/ryzom/server/src/gpm_service/CMakeLists.txt b/code/ryzom/server/src/gpm_service/CMakeLists.txt
index 80ed486bc..51db26044 100644
--- a/code/ryzom/server/src/gpm_service/CMakeLists.txt
+++ b/code/ryzom/server/src/gpm_service/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(gpm_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(gpm_service	admin_modules 
-					game_share 
+					ryzom_gameshare 
 					server_share
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
diff --git a/code/ryzom/server/src/input_output_service/CMakeLists.txt b/code/ryzom/server/src/input_output_service/CMakeLists.txt
index ae87eedb1..142cf8205 100644
--- a/code/ryzom/server/src/input_output_service/CMakeLists.txt
+++ b/code/ryzom/server/src/input_output_service/CMakeLists.txt
@@ -14,7 +14,7 @@ ADD_EXECUTABLE(ios_service ${SRC})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(ios_service	admin_modules 
 					pd_lib
-					game_share 
+					ryzom_gameshare 
 					server_share
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
diff --git a/code/ryzom/server/src/patchman_service/CMakeLists.txt b/code/ryzom/server/src/patchman_service/CMakeLists.txt
index aeffe1b6c..5f388e833 100644
--- a/code/ryzom/server/src/patchman_service/CMakeLists.txt
+++ b/code/ryzom/server/src/patchman_service/CMakeLists.txt
@@ -8,7 +8,7 @@ ADD_EXECUTABLE(patchman_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(patchman_service	admin_modules 
-					game_share 
+					ryzom_gameshare 
 					server_share
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
diff --git a/code/ryzom/tools/patch_gen/CMakeLists.txt b/code/ryzom/tools/patch_gen/CMakeLists.txt
index 4a53f084e..a73867a57 100644
--- a/code/ryzom/tools/patch_gen/CMakeLists.txt
+++ b/code/ryzom/tools/patch_gen/CMakeLists.txt
@@ -4,10 +4,10 @@ SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
 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})
+TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 
 ADD_EXECUTABLE(patch_gen_service ${SERVICE_SRC})
-TARGET_LINK_LIBRARIES(patch_gen_service game_share ${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_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/pdr_util/CMakeLists.txt b/code/ryzom/tools/pdr_util/CMakeLists.txt
index 3d27725b7..67f40493a 100644
--- a/code/ryzom/tools/pdr_util/CMakeLists.txt
+++ b/code/ryzom/tools/pdr_util/CMakeLists.txt
@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(pdr_util ${SRC})
 
 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})
+TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS pdr_util RUNTIME DESTINATION bin COMPONENT tools)
diff --git a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
index 5ac473f79..297d2c805 100644
--- a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
+++ b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(	${CMAKE_SOURCE_DIR}/server/src
 			${CMAKE_SOURCE_DIR}/common/src
 			${LIBXML2_INCLUDE_DIR} 
 			${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ai_build_wmap	game_share
+TARGET_LINK_LIBRARIES(ai_build_wmap	ryzom_gameshare
 					server_share 
 					ai_share 
 					${PLATFORM_LINKFLAGS} 
diff --git a/code/ryzom/tools/sheets_packer/CMakeLists.txt b/code/ryzom/tools/sheets_packer/CMakeLists.txt
index f22b82c8c..fc14987ce 100644
--- a/code/ryzom/tools/sheets_packer/CMakeLists.txt
+++ b/code/ryzom/tools/sheets_packer/CMakeLists.txt
@@ -9,8 +9,8 @@ ADD_EXECUTABLE(sheets_packer	${SRC}
 INCLUDE_DIRECTORIES(	${LIBXML2_INCLUDE_DIR} 
 			${NEL_INCLUDE_DIR} 
 			${CMAKE_SOURCE_DIR}/client/src)
-TARGET_LINK_LIBRARIES(sheets_packer	client_sheets
-					game_share
+TARGET_LINK_LIBRARIES(sheets_packer	ryzom_clientsheets
+					ryzom_gameshare
 					${NELMISC_LIBRARY}
 					${NELGEORGES_LIBRARY}
 					${NELNET_LIBRARY}
diff --git a/code/ryzom/tools/stats_scan/CMakeLists.txt b/code/ryzom/tools/stats_scan/CMakeLists.txt
index 801048520..69f19c88d 100644
--- a/code/ryzom/tools/stats_scan/CMakeLists.txt
+++ b/code/ryzom/tools/stats_scan/CMakeLists.txt
@@ -5,7 +5,7 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ char_commands.cp
 ADD_EXECUTABLE(stats_scan ${SRC})
 
 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})
+TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS stats_scan RUNTIME DESTINATION bin COMPONENT tools)