Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-20 13:06:47 +01:00
parent 567ddba324
commit 2d15a8d6e8
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/CMakeModules/FindWindowsSDK.cmake
View file

@ -349,7 +349,6 @@ FIND_PATH(WINSDK_OPENGL_INCLUDE_DIR GL.h
SET(WINSDK_LIBRARY_DIRS SET(WINSDK_LIBRARY_DIRS
${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX} ${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX} ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX}
${WINSDK_DIR}/Lib/${WINSDK_SUFFIX}
) )
IF(WINSDK_SUFFIXES) IF(WINSDK_SUFFIXES)

8
code/ryzom/client/src/client.rc
View file

@ -185,10 +185,18 @@ BEGIN
VALUE "FileDescription", "Ryzom client" VALUE "FileDescription", "Ryzom client"
VALUE "FileVersion", RYZOM_VERSION VALUE "FileVersion", RYZOM_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#if defined(FINAL_VERSION) && (FINAL_VERSION == 1)
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "ryzom_client_d.exe" VALUE "OriginalFilename", "ryzom_client_d.exe"
#else #else
VALUE "OriginalFilename", "ryzom_client_r.exe" 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 #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION