From 4e28b88c228882f744d853bba16858c709c448fa Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 3 May 2020 19:02:26 +0100 Subject: [PATCH] Windows: fixes for compositor builds --- build_release_windows.bat | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/build_release_windows.bat b/build_release_windows.bat index 8ae06f2..0f1aaaf 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -35,7 +35,6 @@ cd ..\build-fg32 cmake ..\flightgear -G "Visual Studio 14" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 ^ - -DCMAKE_PREFIX_PATH:PATH=%OSG32% ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ @@ -44,16 +43,13 @@ cmake ..\flightgear -G "Visual Studio 14" ^ -DENABLE_COMPOSITOR:BOOL=OFF cmake --build . --config RelWithDebInfo --target INSTALL -md %WORKSPACE%/install/msvc140/compositor - cd ..\build-fg32-compositor cmake ..\flightgear -G "Visual Studio 14" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140/compositor ^ - -DCMAKE_PREFIX_PATH:PATH=%OSG32%;%WORKSPACE%/install/msvc140/ ^ + -DCMAKE_PREFIX_PATH:PATH=%QT5SDK32%;%OSG32%;%WORKSPACE%/install/msvc140/ ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^ - -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% ^ -DENABLE_SWIFT:BOOL=ON ^ -DENABLE_COMPOSITOR:BOOL=ON @@ -87,9 +83,6 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^ -DENABLE_COMPOSITOR:BOOL=OFF cmake --build . --config RelWithDebInfo --target INSTALL -md %WORKSPACE%/install/msvc140-64/compositor - - cd ..\build-fg64-compositor cmake ..\flightgear -G "Visual Studio 14 Win64" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^