From cc30e3b8f8c120302693acc822621b3fc74d8139 Mon Sep 17 00:00:00 2001 From: StudioEtrange Date: Wed, 24 Jul 2013 19:22:38 +0000 Subject: [PATCH 1/3] ENV: WinSDK8 VS2012 Compilation in 64 Bits ERROR: error when linking client CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012 see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx --HG-- branch : StudioEtrange/env-winsdk8-vs2012-compilation-in-64-bit-1374693753244 --- code/CMakeModules/nel.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 4308d0b44..834a5da5b 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -123,7 +123,7 @@ MACRO(NL_DEFAULT_PROPS name label) VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} COMPILE_FLAGS "/GA" - LINK_FLAGS "/VERSION:${NL_VERSION}") + LINK_FLAGS "/VERSION:${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}") ENDIF(${type} STREQUAL EXECUTABLE AND WIN32) IF(WITH_STLPORT AND WIN32) From 885a39ad7eacf9ded7a66d11ab345c712da4c2a7 Mon Sep 17 00:00:00 2001 From: StudioEtrange Date: Wed, 24 Jul 2013 19:31:10 +0000 Subject: [PATCH 2/3] nel.cmake edited online with Bitbucket --HG-- branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640 --- code/CMakeModules/nel.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 834a5da5b..4308d0b44 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -123,7 +123,7 @@ MACRO(NL_DEFAULT_PROPS name label) VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} COMPILE_FLAGS "/GA" - LINK_FLAGS "/VERSION:${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}") + LINK_FLAGS "/VERSION:${NL_VERSION}") ENDIF(${type} STREQUAL EXECUTABLE AND WIN32) IF(WITH_STLPORT AND WIN32) From f18dd1f351cbf77024f931b8d99960604a576ca5 Mon Sep 17 00:00:00 2001 From: StudioEtrange Date: Wed, 24 Jul 2013 19:32:41 +0000 Subject: [PATCH 3/3] Error passing wrong version number to msvc linker ENV: WinSDK8 VS2012 Compilation in 64 Bits ERROR: error when linking client CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012 see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx --HG-- branch : StudioEtrange/error-passing-wrong-version-number-to-ms-1374694351376 --- code/CMakeModules/nel.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 4308d0b44..834a5da5b 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -123,7 +123,7 @@ MACRO(NL_DEFAULT_PROPS name label) VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} COMPILE_FLAGS "/GA" - LINK_FLAGS "/VERSION:${NL_VERSION}") + LINK_FLAGS "/VERSION:${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}") ENDIF(${type} STREQUAL EXECUTABLE AND WIN32) IF(WITH_STLPORT AND WIN32)