From 7d7ded9528f4a48059c30534482388814e0ca0cc Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 26 Jun 2010 16:37:27 +0200 Subject: [PATCH] Changed: #842 Added new optimizations for VC++ linker and compiler --- code/nel/CMakeModules/nel.cmake | 13 ++++++++++--- code/nel/samples/3d/cegui/CMakeLists.txt | 4 +++- code/nel/samples/3d/cluster_viewer/CMakeLists.txt | 4 +++- code/nel/samples/3d/font/CMakeLists.txt | 4 +++- code/nel/samples/3d/shape_viewer/CMakeLists.txt | 4 +++- code/nel/samples/georges/CMakeLists.txt | 3 ++- code/nel/samples/misc/command/CMakeLists.txt | 3 ++- code/nel/samples/misc/configfile/CMakeLists.txt | 3 ++- code/nel/samples/misc/debug/CMakeLists.txt | 3 ++- code/nel/samples/misc/i18n/CMakeLists.txt | 3 ++- code/nel/samples/misc/log/CMakeLists.txt | 3 ++- code/nel/samples/misc/strings/CMakeLists.txt | 3 ++- code/nel/samples/misc/types_check/CMakeLists.txt | 5 ++++- code/nel/samples/net/chat/CMakeLists.txt | 8 ++++++-- code/nel/samples/net/class_transport/CMakeLists.txt | 8 ++++++-- code/nel/samples/net/login_system/CMakeLists.txt | 7 +++++-- code/nel/samples/net/udp/CMakeLists.txt | 6 ++++-- code/nel/samples/pacs/CMakeLists.txt | 4 +++- code/nel/samples/sound_sources/CMakeLists.txt | 3 ++- code/nel/src/3d/CMakeLists.txt | 1 - code/nel/src/3d/driver/direct3d/CMakeLists.txt | 3 ++- code/nel/src/3d/driver/opengl/CMakeLists.txt | 3 ++- code/nel/src/cegui/CMakeLists.txt | 3 ++- code/nel/src/georges/CMakeLists.txt | 1 - code/nel/src/ligo/CMakeLists.txt | 1 - code/nel/src/logic/CMakeLists.txt | 1 - code/nel/src/misc/CMakeLists.txt | 1 - code/nel/src/net/CMakeLists.txt | 1 - code/nel/src/sound/CMakeLists.txt | 1 - code/nel/src/sound/driver/dsound/CMakeLists.txt | 3 ++- code/nel/src/sound/driver/fmod/CMakeLists.txt | 3 ++- code/nel/src/sound/driver/openal/CMakeLists.txt | 3 ++- code/nel/src/sound/driver/xaudio2/CMakeLists.txt | 3 ++- code/nel/tools/3d/build_clod_bank/CMakeLists.txt | 3 ++- code/nel/tools/3d/build_clodtex/CMakeLists.txt | 3 ++- code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt | 3 ++- code/nel/tools/3d/build_far_bank/CMakeLists.txt | 5 +++-- code/nel/tools/3d/build_interface/CMakeLists.txt | 3 ++- code/nel/tools/3d/build_shadow_skin/CMakeLists.txt | 3 ++- code/nel/tools/3d/build_smallbank/CMakeLists.txt | 3 ++- code/nel/tools/3d/cluster_viewer/CMakeLists.txt | 4 +++- code/nel/tools/3d/file_info/CMakeLists.txt | 3 ++- code/nel/tools/3d/get_neighbors/CMakeLists.txt | 3 ++- code/nel/tools/3d/ig_add/CMakeLists.txt | 3 ++- code/nel/tools/3d/ig_info/CMakeLists.txt | 3 ++- code/nel/tools/3d/ig_lighter/CMakeLists.txt | 3 ++- code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt | 3 ++- code/nel/tools/3d/object_viewer/CMakeLists.txt | 3 ++- code/nel/tools/3d/object_viewer_exe/CMakeLists.txt | 3 ++- code/nel/tools/3d/panoply_maker/CMakeLists.txt | 3 ++- .../3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt | 3 ++- .../tools/3d/plugin_max/nel_export/CMakeLists.txt | 3 ++- .../tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt | 3 ++- .../3d/plugin_max/nel_patch_edit/CMakeLists.txt | 3 ++- .../3d/plugin_max/nel_patch_edit_adv/CMakeLists.txt | 3 ++- .../3d/plugin_max/nel_patch_lib/CMakeLists.txt | 3 ++- .../3d/plugin_max/nel_patch_paint/CMakeLists.txt | 3 ++- .../plugin_max/nel_vertex_tree_paint/CMakeLists.txt | 3 ++- .../tools/3d/plugin_max/tile_utility/CMakeLists.txt | 3 ++- code/nel/tools/3d/shapes_exporter/CMakeLists.txt | 4 +++- code/nel/tools/3d/tga_cut/CMakeLists.txt | 3 ++- code/nel/tools/3d/tga_resize/CMakeLists.txt | 3 ++- code/nel/tools/3d/tile_edit/CMakeLists.txt | 3 ++- code/nel/tools/3d/zone_check_bind/CMakeLists.txt | 3 ++- code/nel/tools/3d/zone_dependencies/CMakeLists.txt | 3 ++- code/nel/tools/3d/zone_dump/CMakeLists.txt | 3 ++- code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt | 3 ++- code/nel/tools/3d/zone_lighter/CMakeLists.txt | 3 ++- code/nel/tools/3d/zone_welder/CMakeLists.txt | 3 ++- code/nel/tools/3d/zviewer/CMakeLists.txt | 3 ++- code/nel/tools/georges/georges2csv/CMakeLists.txt | 3 ++- .../nel/tools/logic/logic_editor_dll/CMakeLists.txt | 5 ++++- .../nel/tools/logic/logic_editor_exe/CMakeLists.txt | 3 ++- code/nel/tools/misc/bnp_make/CMakeLists.txt | 3 ++- code/nel/tools/misc/disp_sheet_id/CMakeLists.txt | 3 ++- code/nel/tools/misc/make_sheet_id/CMakeLists.txt | 3 ++- code/nel/tools/misc/xml_packer/CMakeLists.txt | 3 ++- code/nel/tools/nel_unit_test/CMakeLists.txt | 3 ++- code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt | 3 ++- .../tools/pacs/build_indoor_rbank/CMakeLists.txt | 3 ++- code/nel/tools/pacs/build_rbank/CMakeLists.txt | 3 ++- 81 files changed, 181 insertions(+), 88 deletions(-) diff --git a/code/nel/CMakeModules/nel.cmake b/code/nel/CMakeModules/nel.cmake index 628fe552b..6931cecca 100644 --- a/code/nel/CMakeModules/nel.cmake +++ b/code/nel/CMakeModules/nel.cmake @@ -113,9 +113,12 @@ MACRO(NL_SETUP_BUILD) 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") + SET(NL_DEBUG_CFLAGS "/EHa /Ob1 /Zi") + SET(NL_RELEASE_CFLAGS "/EHa /Zi /Ox /Ob2 /Oi /Ot /Oy /GT /GF /GS-") + SET(NL_RELEASEDEBUG_CFLAGS "/EHa /DNL_RELEASE_DEBUG /Zi /Ob2 /GF") + SET(NL_DEBUG_LINK_FLAGS "/NODEFAULTLIB:msvcrt") + SET(NL_RELEASE_LINK_FLAGS "/OPT:REF /OPT:ICF") + SET(NL_RELEASEDEBUG_LINK_FLAGS "/OPT:REF /OPT:ICF") 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) @@ -165,18 +168,22 @@ MACRO(NL_SETUP_BUILD_FLAGS) ## 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} ") + SET(CMAKE_LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG} ${NL_DEBUG_LINK_FLAGS} ${PLATFORM_LINKFLAGS} ") ## 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} ") + SET(CMAKE_LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE} ${NL_RELEASE_LINK_FLAGS} ${PLATFORM_LINKFLAGS} ") ## 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} ") + SET(CMAKE_LINK_FLAGS_RELWITHDEBINFO "${CMAKE_LINK_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_LINK_FLAGS} ${PLATFORM_LINKFLAGS} ") ## 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} ") + SET(LINK_FLAGS_MINSIZEREL "${CMAKE_LINK_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_LINK_CFLAGS} ${PLATFORM_LINKFLAGS} ") ENDMACRO(NL_SETUP_BUILD_FLAGS) MACRO(NL_SETUP_PREFIX_PATHS) diff --git a/code/nel/samples/3d/cegui/CMakeLists.txt b/code/nel/samples/3d/cegui/CMakeLists.txt index 5d36074ae..6e8a19a3f 100644 --- a/code/nel/samples/3d/cegui/CMakeLists.txt +++ b/code/nel/samples/3d/cegui/CMakeLists.txt @@ -8,7 +8,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CEGUI_INCLUDE_DIRS}) TARGET_LINK_LIBRARIES(nl_sample_cegui ${LIBXML2_LIBRARIES} ${CEGUI_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nel3d) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_cegui PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, 3D: NeL CEGUI Demo") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt index 671a436f1..22691e258 100644 --- a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt @@ -8,7 +8,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_clusterview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_clusterview PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, 3D: Cluster Viewer") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/font/CMakeLists.txt b/code/nel/samples/3d/font/CMakeLists.txt index 2f5be2254..be5294180 100644 --- a/code/nel/samples/3d/font/CMakeLists.txt +++ b/code/nel/samples/3d/font/CMakeLists.txt @@ -8,7 +8,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_font ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_font PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, 3D: Font") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/shape_viewer/CMakeLists.txt b/code/nel/samples/3d/shape_viewer/CMakeLists.txt index a7d13e8dc..9f337e933 100644 --- a/code/nel/samples/3d/shape_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/shape_viewer/CMakeLists.txt @@ -6,7 +6,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_shapeview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_shapeview PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, 3D: Shape Viewer") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/georges/CMakeLists.txt b/code/nel/samples/georges/CMakeLists.txt index ef420135e..b7ebc962e 100644 --- a/code/nel/samples/georges/CMakeLists.txt +++ b/code/nel/samples/georges/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_georges ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelgeorges nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_georges PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples: Georges") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/command/CMakeLists.txt b/code/nel/samples/misc/command/CMakeLists.txt index 7342d347d..9f471c4c0 100644 --- a/code/nel/samples/misc/command/CMakeLists.txt +++ b/code/nel/samples/misc/command/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_command ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_command PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Misc: Commands") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/configfile/CMakeLists.txt b/code/nel/samples/misc/configfile/CMakeLists.txt index 56eea8a6e..bf71cf7fc 100644 --- a/code/nel/samples/misc/configfile/CMakeLists.txt +++ b/code/nel/samples/misc/configfile/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_configfile ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_configfile PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Misc: Config Files") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/debug/CMakeLists.txt b/code/nel/samples/misc/debug/CMakeLists.txt index 6a0d72fe0..66a06a968 100644 --- a/code/nel/samples/misc/debug/CMakeLists.txt +++ b/code/nel/samples/misc/debug/CMakeLists.txt @@ -9,7 +9,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_debug ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_debug PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Misc: Debugging") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/i18n/CMakeLists.txt b/code/nel/samples/misc/i18n/CMakeLists.txt index 4f19d9cfc..9136a2503 100644 --- a/code/nel/samples/misc/i18n/CMakeLists.txt +++ b/code/nel/samples/misc/i18n/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_i18n ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_i18n PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Misc: I18N") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/log/CMakeLists.txt b/code/nel/samples/misc/log/CMakeLists.txt index bfc7a5c88..6ee6ad078 100644 --- a/code/nel/samples/misc/log/CMakeLists.txt +++ b/code/nel/samples/misc/log/CMakeLists.txt @@ -9,7 +9,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_log ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_log PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Misc: Logging") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/strings/CMakeLists.txt b/code/nel/samples/misc/strings/CMakeLists.txt index d4c8da2b3..72b448b78 100644 --- a/code/nel/samples/misc/strings/CMakeLists.txt +++ b/code/nel/samples/misc/strings/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_strings ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_strings PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Misc: Strings") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/types_check/CMakeLists.txt b/code/nel/samples/misc/types_check/CMakeLists.txt index 6943035b8..d03fa394a 100644 --- a/code/nel/samples/misc/types_check/CMakeLists.txt +++ b/code/nel/samples/misc/types_check/CMakeLists.txt @@ -8,7 +8,10 @@ ADD_EXECUTABLE(nl_sample_types_check ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_types_check ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB}) IF(WIN32) - SET_TARGET_PROPERTIES(nl_sample_types_check PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt") + SET_TARGET_PROPERTIES(nl_sample_types_check PROPERTIES + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + ) ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/chat/CMakeLists.txt b/code/nel/samples/net/chat/CMakeLists.txt index b0614a6d2..b9e79d9d0 100644 --- a/code/nel/samples/net/chat/CMakeLists.txt +++ b/code/nel/samples/net/chat/CMakeLists.txt @@ -12,10 +12,14 @@ TARGET_LINK_LIBRARIES(nl_sample_chatclient ${PLATFORM_LINKFLAGS} nelmisc nelnet) TARGET_LINK_LIBRARIES(nl_sample_chatserver ${PLATFORM_LINKFLAGS} nelmisc nelnet) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_chatclient PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:CONSOLE" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:CONSOLE" PROJECT_LABEL "Samples, Net, Chat: Chat Client") SET_TARGET_PROPERTIES(nl_sample_chatserver PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, Net, Chat: Chat Server") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/class_transport/CMakeLists.txt b/code/nel/samples/net/class_transport/CMakeLists.txt index a1afbf471..f8f67522e 100644 --- a/code/nel/samples/net/class_transport/CMakeLists.txt +++ b/code/nel/samples/net/class_transport/CMakeLists.txt @@ -9,10 +9,14 @@ TARGET_LINK_LIBRARIES(nl_sample_ct_ai_service ${PLATFORM_LINKFLAGS} nelmisc neln TARGET_LINK_LIBRARIES(nl_sample_ct_gd_service ${PLATFORM_LINKFLAGS} nelmisc nelnet) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_ct_ai_service PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, Net, Class Transport: AI Service") SET_TARGET_PROPERTIES(nl_sample_ct_gd_service PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, Net, Class Transport: GD Service") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/login_system/CMakeLists.txt b/code/nel/samples/net/login_system/CMakeLists.txt index 02d11a83f..e10000242 100644 --- a/code/nel/samples/net/login_system/CMakeLists.txt +++ b/code/nel/samples/net/login_system/CMakeLists.txt @@ -9,10 +9,13 @@ TARGET_LINK_LIBRARIES(nl_sample_ls_client ${PLATFORM_LINKFLAGS} nelmisc nelnet) TARGET_LINK_LIBRARIES(nl_sample_ls_fes ${PLATFORM_LINKFLAGS} nelmisc nelnet) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_ls_client PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Net, Login Service: LS Client") SET_TARGET_PROPERTIES(nl_sample_ls_fes PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Samples, Net, Login Service: LS Frontend") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/udp/CMakeLists.txt b/code/nel/samples/net/udp/CMakeLists.txt index 4fb908f7f..251211546 100644 --- a/code/nel/samples/net/udp/CMakeLists.txt +++ b/code/nel/samples/net/udp/CMakeLists.txt @@ -23,10 +23,12 @@ TARGET_LINK_LIBRARIES(nl_sample_udpclient ${PLATFORM_LINKFLAGS} nelmisc nelnet n TARGET_LINK_LIBRARIES(nl_sample_udpserver ${PLATFORM_LINKFLAGS} nelmisc nelnet) IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_udpclient PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Net, UDP: UDP Client") SET_TARGET_PROPERTIES(nl_sample_udpserver PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples, Net, UDP: UDP Server") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/pacs/CMakeLists.txt b/code/nel/samples/pacs/CMakeLists.txt index ba43e2433..53a080ab9 100644 --- a/code/nel/samples/pacs/CMakeLists.txt +++ b/code/nel/samples/pacs/CMakeLists.txt @@ -8,7 +8,9 @@ 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 - LINK_FLAGS "/NODEFAULTLIB:libcmt /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) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/sound_sources/CMakeLists.txt b/code/nel/samples/sound_sources/CMakeLists.txt index 7a796e6ca..405b25387 100644 --- a/code/nel/samples/sound_sources/CMakeLists.txt +++ b/code/nel/samples/sound_sources/CMakeLists.txt @@ -8,7 +8,8 @@ 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 - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Samples: Sound System") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index 7a9003cc8..7ad2acffa 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -681,7 +681,6 @@ IF(WIN32) SET_TARGET_PROPERTIES(nel3d PROPERTIES COMPILE_FLAGS "/Yustd3d.h") SET_SOURCE_FILES_PROPERTIES(std3d.cpp PROPERTIES COMPILE_FLAGS "/Ycstd3d.h") SET_TARGET_PROPERTIES(nel3d PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") diff --git a/code/nel/src/3d/driver/direct3d/CMakeLists.txt b/code/nel/src/3d/driver/direct3d/CMakeLists.txt index 7cdd15dc6..80b713c00 100644 --- a/code/nel/src/3d/driver/direct3d/CMakeLists.txt +++ b/code/nel/src/3d/driver/direct3d/CMakeLists.txt @@ -13,7 +13,8 @@ TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d ${LIBXML2_LIBRARIES} ${FREETYPE SET_TARGET_PROPERTIES(nel_drv_direct3d_win PROPERTIES VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" COMPILE_FLAGS "/Yustddirect3d.h" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt index ae5b2101b..73a196c7f 100644 --- a/code/nel/src/3d/driver/opengl/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt @@ -27,7 +27,8 @@ IF(WIN32) SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS "/NODEFAULTLIB:libcmt") + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}") ADD_DEFINITIONS(/DDRIVER_OPENGL_EXPORTS) ELSE(WIN32) IF(APPLE) diff --git a/code/nel/src/cegui/CMakeLists.txt b/code/nel/src/cegui/CMakeLists.txt index 72e138665..1b521502f 100644 --- a/code/nel/src/cegui/CMakeLists.txt +++ b/code/nel/src/cegui/CMakeLists.txt @@ -13,7 +13,8 @@ IF(WIN32) SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS "/NODEFAULTLIB:libcmt") + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}") ADD_DEFINITIONS("/DNEL_CEGUIRENDERER_EXPORTS") ENDIF(WIN32) diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 87a3c9a90..a454b6555 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -23,7 +23,6 @@ IF(WIN32) SET_TARGET_PROPERTIES(nelgeorges PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h") SET_SOURCE_FILES_PROPERTIES(stdgeorges.cpp PROPERTIES COMPILE_FLAGS "/Ycstdgeorges.h") SET_TARGET_PROPERTIES(nelgeorges PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") ENDIF(WIN32) diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 74fbc08b1..c1ddd5b27 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -17,7 +17,6 @@ SET_TARGET_PROPERTIES(nelligo PROPERTIES IF(WIN32) SET_TARGET_PROPERTIES(nelligo PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") ENDIF(WIN32) diff --git a/code/nel/src/logic/CMakeLists.txt b/code/nel/src/logic/CMakeLists.txt index ed1a389ac..806190233 100644 --- a/code/nel/src/logic/CMakeLists.txt +++ b/code/nel/src/logic/CMakeLists.txt @@ -15,7 +15,6 @@ SET_TARGET_PROPERTIES(nellogic PROPERTIES IF(WIN32) SET_TARGET_PROPERTIES(nellogic PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") ENDIF(WIN32) diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 4369b227a..15d069036 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -43,7 +43,6 @@ IF(WIN32) ENDFOREACH (FILENAME) SET_TARGET_PROPERTIES(nelmisc PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR}) diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt index d1cde1d2d..9bf83694c 100644 --- a/code/nel/src/net/CMakeLists.txt +++ b/code/nel/src/net/CMakeLists.txt @@ -34,7 +34,6 @@ IF(WIN32) SET_TARGET_PROPERTIES(${NLNET_LIB} PROPERTIES COMPILE_FLAGS "/Yustdnet.h") SET_SOURCE_FILES_PROPERTIES(stdnet.cpp PROPERTIES COMPILE_FLAGS "/Ycstdnet.h") SET_TARGET_PROPERTIES(${NLNET_LIB} PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") ENDIF(WIN32) diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 95f9e440d..3ab360976 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -26,7 +26,6 @@ IF(WIN32) SET_TARGET_PROPERTIES(nelsound PROPERTIES COMPILE_FLAGS "/Yustdsound.h") SET_SOURCE_FILES_PROPERTIES(stdsound.cpp PROPERTIES COMPILE_FLAGS "/Ycstdsound.h") SET_TARGET_PROPERTIES(nelsound PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") ENDIF(WIN32) diff --git a/code/nel/src/sound/driver/dsound/CMakeLists.txt b/code/nel/src/sound/driver/dsound/CMakeLists.txt index b6c27e3b3..53e2ebfe5 100644 --- a/code/nel/src/sound/driver/dsound/CMakeLists.txt +++ b/code/nel/src/sound/driver/dsound/CMakeLists.txt @@ -7,7 +7,8 @@ TARGET_LINK_LIBRARIES(nel_drv_dsound ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSD SET_TARGET_PROPERTIES(nel_drv_dsound PROPERTIES VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" COMPILE_FLAGS "/Yustddsound.h" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" diff --git a/code/nel/src/sound/driver/fmod/CMakeLists.txt b/code/nel/src/sound/driver/fmod/CMakeLists.txt index 3e9dc770b..193100737 100644 --- a/code/nel/src/sound/driver/fmod/CMakeLists.txt +++ b/code/nel/src/sound/driver/fmod/CMakeLists.txt @@ -14,7 +14,8 @@ IF(WIN32) SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES COMPILE_FLAGS "/Yustdfmod.h") SET_SOURCE_FILES_PROPERTIES(stdfmod.cpp PROPERTIES COMPILE_FLAGS "/Ycstdfmod.h") SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r") ENDIF(WIN32) diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/code/nel/src/sound/driver/openal/CMakeLists.txt index ca9d250e5..8bacc79fc 100644 --- a/code/nel/src/sound/driver/openal/CMakeLists.txt +++ b/code/nel/src/sound/driver/openal/CMakeLists.txt @@ -18,7 +18,8 @@ IF(WIN32) SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES COMPILE_FLAGS "/Yustdopenal.h") SET_SOURCE_FILES_PROPERTIES(stdopenal.cpp PROPERTIES COMPILE_FLAGS "/Ycstdopenal.h") SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" PROJECT_LABEL "Driver, Sound: OpenAL") diff --git a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt index 2cea607ea..c1c6b2367 100644 --- a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt +++ b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt @@ -13,7 +13,8 @@ IF(WIN32) SET_TARGET_PROPERTIES(nel_drv_xaudio2 PROPERTIES COMPILE_FLAGS "/Yustdxaudio2.h") SET_SOURCE_FILES_PROPERTIES(stdxaudio2.cpp PROPERTIES COMPILE_FLAGS "/Ycstdxaudio2.h") SET_TARGET_PROPERTIES(nel_drv_xaudio2 PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" PROJECT_LABEL "Driver, Sound: XAudio2") diff --git a/code/nel/tools/3d/build_clod_bank/CMakeLists.txt b/code/nel/tools/3d/build_clod_bank/CMakeLists.txt index 61b67041e..38cf8100b 100644 --- a/code/nel/tools/3d/build_clod_bank/CMakeLists.txt +++ b/code/nel/tools/3d/build_clod_bank/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_clod_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(build_clod_bank PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: build_clod_bank") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/build_clodtex/CMakeLists.txt b/code/nel/tools/3d/build_clodtex/CMakeLists.txt index 74b21c0a8..286db1210 100644 --- a/code/nel/tools/3d/build_clodtex/CMakeLists.txt +++ b/code/nel/tools/3d/build_clodtex/CMakeLists.txt @@ -7,7 +7,8 @@ TARGET_LINK_LIBRARIES(build_clodtex ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} n IF(WIN32) SET_TARGET_PROPERTIES(build_clodtex PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: build_clodtex") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt b/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt index e9a4afd16..25309c532 100644 --- a/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt +++ b/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_coarse_mesh ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(build_coarse_mesh PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: build_coarse_mesh") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/build_far_bank/CMakeLists.txt b/code/nel/tools/3d/build_far_bank/CMakeLists.txt index 313573286..9a23be4d8 100644 --- a/code/nel/tools/3d/build_far_bank/CMakeLists.txt +++ b/code/nel/tools/3d/build_far_bank/CMakeLists.txt @@ -6,8 +6,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_far_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(build_far_bank PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" - PROJECT_LABEL "Tools, 3D: build_far_bank") + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + PROJECT_LABEL "Tools, 3D: build_far_bank") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/build_interface/CMakeLists.txt b/code/nel/tools/3d/build_interface/CMakeLists.txt index c6f09b6ea..3cb924ba7 100644 --- a/code/nel/tools/3d/build_interface/CMakeLists.txt +++ b/code/nel/tools/3d/build_interface/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_interface ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(build_interface PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: build_interface") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt b/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt index 608902380..f9cfd3e1d 100644 --- a/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt +++ b/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_shadow_skin ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(build_shadow_skin PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: build_shadow_skin") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/build_smallbank/CMakeLists.txt b/code/nel/tools/3d/build_smallbank/CMakeLists.txt index d101ed28a..d0cb1fab9 100644 --- a/code/nel/tools/3d/build_smallbank/CMakeLists.txt +++ b/code/nel/tools/3d/build_smallbank/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_smallbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(build_smallbank PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: build_smallbank") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/cluster_viewer/CMakeLists.txt b/code/nel/tools/3d/cluster_viewer/CMakeLists.txt index f055fa52f..7a0167de6 100644 --- a/code/nel/tools/3d/cluster_viewer/CMakeLists.txt +++ b/code/nel/tools/3d/cluster_viewer/CMakeLists.txt @@ -6,7 +6,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(cluster_viewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(cluster_viewer PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + LINK_FLAGS "/SUBSYSTEM:WINDOWS" PROJECT_LABEL "Tools, 3D: Cluster Viewer") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/file_info/CMakeLists.txt b/code/nel/tools/3d/file_info/CMakeLists.txt index ce6c06e8c..e2b299c78 100644 --- a/code/nel/tools/3d/file_info/CMakeLists.txt +++ b/code/nel/tools/3d/file_info/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(file_info ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(file_info PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: file_info") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/get_neighbors/CMakeLists.txt b/code/nel/tools/3d/get_neighbors/CMakeLists.txt index 78d3dd064..2ab3390f2 100644 --- a/code/nel/tools/3d/get_neighbors/CMakeLists.txt +++ b/code/nel/tools/3d/get_neighbors/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(get_neighbors ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS}) IF(WIN32) SET_TARGET_PROPERTIES(get_neighbors PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: get_neighbors") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/ig_add/CMakeLists.txt b/code/nel/tools/3d/ig_add/CMakeLists.txt index e34339935..e910e3f27 100644 --- a/code/nel/tools/3d/ig_add/CMakeLists.txt +++ b/code/nel/tools/3d/ig_add/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ig_add ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(ig_add PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: ig_add") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/ig_info/CMakeLists.txt b/code/nel/tools/3d/ig_info/CMakeLists.txt index aae6eef24..5cf4fc621 100644 --- a/code/nel/tools/3d/ig_info/CMakeLists.txt +++ b/code/nel/tools/3d/ig_info/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ig_info ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(ig_info PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: ig_info") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/ig_lighter/CMakeLists.txt b/code/nel/tools/3d/ig_lighter/CMakeLists.txt index 4e353ce2a..1cc3be3fa 100644 --- a/code/nel/tools/3d/ig_lighter/CMakeLists.txt +++ b/code/nel/tools/3d/ig_lighter/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d nelpacs) IF(WIN32) SET_TARGET_PROPERTIES(ig_lighter PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: ig_lighter") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt b/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt index ef060e622..29081370f 100644 --- a/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt +++ b/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt @@ -17,7 +17,8 @@ TARGET_LINK_LIBRARIES(ligoscape_utility SET_TARGET_PROPERTIES(ligoscape_utility PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" SUFFIX ".dlx" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" diff --git a/code/nel/tools/3d/object_viewer/CMakeLists.txt b/code/nel/tools/3d/object_viewer/CMakeLists.txt index e78ef586f..1268a92b8 100644 --- a/code/nel/tools/3d/object_viewer/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer/CMakeLists.txt @@ -20,7 +20,8 @@ TARGET_LINK_LIBRARIES(object_viewer_dll SET_TARGET_PROPERTIES(object_viewer_dll PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" PROJECT_LABEL "Tools, 3D: Object Viewer DLL") diff --git a/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt b/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt index 9d012854d..2fc4b8fe3 100644 --- a/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt @@ -19,7 +19,8 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) SET_TARGET_PROPERTIES(object_viewer PROPERTIES COMPILE_FLAGS "/Yustd_afx.h") SET_SOURCE_FILES_PROPERTIES(std_afx.cpp PROPERTIES COMPILE_FLAGS "/Ycstd_afx.h") SET_TARGET_PROPERTIES(object_viewer PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: Object Viewer") INSTALL(TARGETS object_viewer RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/panoply_maker/CMakeLists.txt b/code/nel/tools/3d/panoply_maker/CMakeLists.txt index 62b644c86..b0d0c0f90 100644 --- a/code/nel/tools/3d/panoply_maker/CMakeLists.txt +++ b/code/nel/tools/3d/panoply_maker/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${SQUISH_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d) IF(WIN32) SET_TARGET_PROPERTIES(panoply_maker PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: panoply_maker") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt index df21085bf..a20977bd2 100644 --- a/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt @@ -14,7 +14,8 @@ TARGET_LINK_LIBRARIES(nel_3dsmax_shared SET_TARGET_PROPERTIES(nel_3dsmax_shared PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" PROJECT_LABEL "MAX Plugin: NeL 3DSMAX Shared") diff --git a/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt index e71388bef..848deb77e 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt @@ -22,7 +22,8 @@ TARGET_LINK_LIBRARIES(nel_export SET_TARGET_PROPERTIES(nel_export PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" SUFFIX ".dlu" diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt index c7ea7c645..7ed6460ab 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt @@ -7,7 +7,8 @@ TARGET_LINK_LIBRARIES(nel_mesh_lib ${LIBXML2_LIBRARIES} nelmisc) SET_TARGET_PROPERTIES(nel_mesh_lib PROPERTIES VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" PROJECT_LABEL "MAX Plugin: NeL Mesh Library") diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt index 3530793ee..61049347e 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt @@ -16,7 +16,8 @@ TARGET_LINK_LIBRARIES(nel_patch_edit SET_TARGET_PROPERTIES(nel_patch_edit PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" SUFFIX ".dlm" diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/CMakeLists.txt index 5629a8a26..15f2dab27 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/CMakeLists.txt @@ -16,7 +16,8 @@ TARGET_LINK_LIBRARIES(nel_patch_edit_adv SET_TARGET_PROPERTIES(nel_patch_edit_adv PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" SUFFIX ".dlm" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt index d9fcb0799..6110cc0d3 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_patch_lib/CMakeLists.txt @@ -11,7 +11,8 @@ TARGET_LINK_LIBRARIES(nel_patch_lib SET_TARGET_PROPERTIES(nel_patch_lib PROPERTIES VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" PROJECT_LABEL "MAX Plugin: NeL Patch Library") diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt index fa2627300..8b0c940e9 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt @@ -18,7 +18,8 @@ TARGET_LINK_LIBRARIES(nel_patch_paint comctl32.lib) SET_TARGET_PROPERTIES(nel_patch_paint PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" VERSION ${NL_VERSION} SUFFIX ".dlm" DEBUG_POSTFIX "_d" diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt index e8139116c..4fa021475 100644 --- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt @@ -16,7 +16,8 @@ TARGET_LINK_LIBRARIES(nel_vertex_tree_paint SET_TARGET_PROPERTIES(nel_vertex_tree_paint PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" SUFFIX ".dlm" diff --git a/code/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt b/code/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt index c79ad48bc..8430da2ec 100644 --- a/code/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt +++ b/code/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt @@ -16,7 +16,8 @@ TARGET_LINK_LIBRARIES(tile_utility SET_TARGET_PROPERTIES(tile_utility PROPERTIES VERSION ${NL_VERSION} - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" SUFFIX ".dlu" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" diff --git a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt index 0f2591315..b84f03876 100644 --- a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt +++ b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt @@ -6,7 +6,9 @@ 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 "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + 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}) diff --git a/code/nel/tools/3d/tga_cut/CMakeLists.txt b/code/nel/tools/3d/tga_cut/CMakeLists.txt index 08e966ba1..7da97cfe0 100644 --- a/code/nel/tools/3d/tga_cut/CMakeLists.txt +++ b/code/nel/tools/3d/tga_cut/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(tga_cut ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(tga_cut PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: tga_cut") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/tga_resize/CMakeLists.txt b/code/nel/tools/3d/tga_resize/CMakeLists.txt index f6ac80d2a..dc66a7b93 100644 --- a/code/nel/tools/3d/tga_resize/CMakeLists.txt +++ b/code/nel/tools/3d/tga_resize/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(tga_resize ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(tga_resize PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: tga_resize") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/tile_edit/CMakeLists.txt b/code/nel/tools/3d/tile_edit/CMakeLists.txt index ddc261675..08bc21575 100644 --- a/code/nel/tools/3d/tile_edit/CMakeLists.txt +++ b/code/nel/tools/3d/tile_edit/CMakeLists.txt @@ -14,7 +14,8 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -D_AFXDLL) IF(WIN32) SET_TARGET_PROPERTIES(tile_edit PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + 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") ENDIF(WIN32) diff --git a/code/nel/tools/3d/zone_check_bind/CMakeLists.txt b/code/nel/tools/3d/zone_check_bind/CMakeLists.txt index d35cd2298..1b1ff3584 100644 --- a/code/nel/tools/3d/zone_check_bind/CMakeLists.txt +++ b/code/nel/tools/3d/zone_check_bind/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(zone_check_bind ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(zone_check_bind PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: zone_check_bind") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/zone_dependencies/CMakeLists.txt b/code/nel/tools/3d/zone_dependencies/CMakeLists.txt index 8655251fc..d89ef1804 100644 --- a/code/nel/tools/3d/zone_dependencies/CMakeLists.txt +++ b/code/nel/tools/3d/zone_dependencies/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(zone_dependencies ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d nelgeorges) IF(WIN32) SET_TARGET_PROPERTIES(zone_dependencies PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: zone_dependencies") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/zone_dump/CMakeLists.txt b/code/nel/tools/3d/zone_dump/CMakeLists.txt index 46523fbfb..482f69fbf 100644 --- a/code/nel/tools/3d/zone_dump/CMakeLists.txt +++ b/code/nel/tools/3d/zone_dump/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(zone_dump ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(zone_dump PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: zone_dump") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt index 2344c2c3b..f98a96a4d 100644 --- a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt +++ b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt @@ -6,7 +6,8 @@ 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 "/NODEFAULTLIB:libcmt" + 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}) diff --git a/code/nel/tools/3d/zone_lighter/CMakeLists.txt b/code/nel/tools/3d/zone_lighter/CMakeLists.txt index 8309594c9..3252ea6a5 100644 --- a/code/nel/tools/3d/zone_lighter/CMakeLists.txt +++ b/code/nel/tools/3d/zone_lighter/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(zone_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d nelgeorges) IF(WIN32) SET_TARGET_PROPERTIES(zone_lighter PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: zone_lighter") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/zone_welder/CMakeLists.txt b/code/nel/tools/3d/zone_welder/CMakeLists.txt index 431d2692a..f8868fe08 100644 --- a/code/nel/tools/3d/zone_welder/CMakeLists.txt +++ b/code/nel/tools/3d/zone_welder/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(zone_welder ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(zone_welder PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: zone_welder") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/zviewer/CMakeLists.txt b/code/nel/tools/3d/zviewer/CMakeLists.txt index 24784b21b..050047a16 100644 --- a/code/nel/tools/3d/zviewer/CMakeLists.txt +++ b/code/nel/tools/3d/zviewer/CMakeLists.txt @@ -12,7 +12,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(zviewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) IF(WIN32) SET_TARGET_PROPERTIES(zviewer PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, 3D: Zone Viewer") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/georges/georges2csv/CMakeLists.txt b/code/nel/tools/georges/georges2csv/CMakeLists.txt index 2bef6f1e5..5d7362398 100644 --- a/code/nel/tools/georges/georges2csv/CMakeLists.txt +++ b/code/nel/tools/georges/georges2csv/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(georges2csv ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nelgeorges) IF(WIN32) SET_TARGET_PROPERTIES(georges2csv PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, Georges: georges2csv") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt b/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt index 66ae0cd3c..384428235 100644 --- a/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt +++ b/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt @@ -18,7 +18,10 @@ SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES IF(WIN32) SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES COMPILE_FLAGS "/YuStdAfx.h") SET_SOURCE_FILES_PROPERTIES(StdAfx.cpp PROPERTIES COMPILE_FLAGS "/YcStdAfx.h") - SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt") + SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" + ) ENDIF(WIN32) diff --git a/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt b/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt index 85e673077..aaaa1a75f 100644 --- a/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt +++ b/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt @@ -10,7 +10,8 @@ IF(WIN32) SET_TARGET_PROPERTIES(logic_editor PROPERTIES COMPILE_FLAGS "/YuStdAfx.h") SET_SOURCE_FILES_PROPERTIES(StdAfx.cpp PROPERTIES COMPILE_FLAGS "/YcStdAfx.h") SET_TARGET_PROPERTIES(logic_editor PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, Logic: Logic Editor") ENDIF(WIN32) diff --git a/code/nel/tools/misc/bnp_make/CMakeLists.txt b/code/nel/tools/misc/bnp_make/CMakeLists.txt index 792095d0f..541a5ee1a 100644 --- a/code/nel/tools/misc/bnp_make/CMakeLists.txt +++ b/code/nel/tools/misc/bnp_make/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(bnp_make ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(bnp_make PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, Misc: bnp_make") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt b/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt index b4c2b6bb3..7f5e14ee6 100644 --- a/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt +++ b/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(disp_sheet_id ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(disp_sheet_id PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, Misc: disp_sheet_id") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/misc/make_sheet_id/CMakeLists.txt b/code/nel/tools/misc/make_sheet_id/CMakeLists.txt index 6f99dd0bf..eeace986b 100644 --- a/code/nel/tools/misc/make_sheet_id/CMakeLists.txt +++ b/code/nel/tools/misc/make_sheet_id/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(make_sheet_id ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(make_sheet_id PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, Misc: make_sheet_id") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/misc/xml_packer/CMakeLists.txt b/code/nel/tools/misc/xml_packer/CMakeLists.txt index efce2cabf..9c5826136 100644 --- a/code/nel/tools/misc/xml_packer/CMakeLists.txt +++ b/code/nel/tools/misc/xml_packer/CMakeLists.txt @@ -6,7 +6,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(xml_packer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) IF(WIN32) SET_TARGET_PROPERTIES(xml_packer PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, Misc: xml_packer") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/nel_unit_test/CMakeLists.txt b/code/nel/tools/nel_unit_test/CMakeLists.txt index a7ea93b82..96fe4b110 100644 --- a/code/nel/tools/nel_unit_test/CMakeLists.txt +++ b/code/nel/tools/nel_unit_test/CMakeLists.txt @@ -13,7 +13,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CPPTEST_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_unit_test ${LIBXML2_LIBRARIES} ${CPPTEST_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nelnet nelligo) IF(WIN32) SET_TARGET_PROPERTIES(nel_unit_test PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Unit Tests") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt b/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt index d12d38461..898a63a91 100644 --- a/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt +++ b/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_ig_boxes ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelpacs nel3d) IF(WIN32) SET_TARGET_PROPERTIES(build_ig_boxes PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, PACS: build_ig_boxes") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt index b578cc0e5..2933aabd5 100644 --- a/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt +++ b/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_indoor_rbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelpacs) IF(WIN32) SET_TARGET_PROPERTIES(build_indoor_rbank PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, PACS: build_indoor_rbank") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/pacs/build_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_rbank/CMakeLists.txt index 173ee69ea..607152e73 100644 --- a/code/nel/tools/pacs/build_rbank/CMakeLists.txt +++ b/code/nel/tools/pacs/build_rbank/CMakeLists.txt @@ -8,7 +8,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_rbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelpacs nel3d nelligo) IF(WIN32) SET_TARGET_PROPERTIES(build_rbank PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt" + LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" + LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" PROJECT_LABEL "Tools, PACS: build_rbank") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})