From 70eb74bc09ec196dcaaedd1790fb1feb68ddda20 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 21 Jun 2017 23:04:02 +0100 Subject: [PATCH] Better, stronger, faster linking on Windows. Assume the builds are against a version of OSG with the declspec(export) fix applied, and hence we can use normal linking, not the /FORCE:MULTIPLE thing which slows down and complains. --- build_release_windows.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_release_windows.bat b/build_release_windows.bat index fa72c72..d57106b 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -23,6 +23,7 @@ cd build-sg32 cmake ..\simgear -G "Visual Studio 14" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ + -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DCMAKE_PREFIX_PATH:PATH=%OSG32% ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 cmake --build . --config RelWithDebInfo --target INSTALL @@ -33,6 +34,7 @@ cmake ..\flightgear -G "Visual Studio 14" ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 ^ -DCMAKE_PREFIX_PATH:PATH=%WORKSPACE%/install/msvc140/OpenSceneGraph ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ + -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% cmake --build . --config RelWithDebInfo --target INSTALL @@ -47,6 +49,7 @@ cd build-sg64 cmake ..\SimGear -G "Visual Studio 14 Win64" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ + -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DCMAKE_PREFIX_PATH:PATH=%OSG64% ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 cmake --build . --config RelWithDebInfo --target INSTALL @@ -57,6 +60,7 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 ^ -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^ + -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% cmake --build . --config RelWithDebInfo --target INSTALL