From 6c27e927b5b2d63c92bb45066db344d7e2478935 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 20 Jan 2016 13:05:55 +0100 Subject: [PATCH 1/2] Fixed: Compilation in 64 bits under Windows --HG-- branch : develop --- code/CMakeModules/FindWindowsSDK.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/code/CMakeModules/FindWindowsSDK.cmake b/code/CMakeModules/FindWindowsSDK.cmake index c5e8c2897..b91c932f8 100644 --- a/code/CMakeModules/FindWindowsSDK.cmake +++ b/code/CMakeModules/FindWindowsSDK.cmake @@ -349,7 +349,6 @@ FIND_PATH(WINSDK_OPENGL_INCLUDE_DIR GL.h SET(WINSDK_LIBRARY_DIRS ${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX} ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX} - ${WINSDK_DIR}/Lib/${WINSDK_SUFFIX} ) IF(WINSDK_SUFFIXES) From 1082c49aa6bf76154dfc5b900f8d8d307c98e5c6 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 20 Jan 2016 13:06:15 +0100 Subject: [PATCH 2/2] Changed: Use a different original filename for DEV version --HG-- branch : develop --- code/ryzom/client/src/client.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/ryzom/client/src/client.rc b/code/ryzom/client/src/client.rc index 2b22bf9fe..d4fa4d8c4 100644 --- a/code/ryzom/client/src/client.rc +++ b/code/ryzom/client/src/client.rc @@ -185,11 +185,19 @@ BEGIN VALUE "FileDescription", "Ryzom client" VALUE "FileVersion", RYZOM_VERSION VALUE "LegalCopyright", COPYRIGHT +#if defined(FINAL_VERSION) && (FINAL_VERSION == 1) #ifdef _DEBUG VALUE "OriginalFilename", "ryzom_client_d.exe" #else VALUE "OriginalFilename", "ryzom_client_r.exe" #endif +#else +#ifdef _DEBUG + VALUE "OriginalFilename", "ryzom_client_dev_d.exe" +#else + VALUE "OriginalFilename", "ryzom_client_dev_r.exe" +#endif +#endif VALUE "ProductName", "Ryzom Core" VALUE "ProductVersion", NL_VERSION END