FGFS-4.1/fgmeta
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: fixes for compositor builds

Browse Source
This commit is contained in:
James Turner
2020-05-03 19:02:26 +01:00
parent fa0dcb5d4d
commit 4e28b88c22
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_release_windows.bat
+1 -8
View File
@@ -35,7 +35,6 @@ cd ..\build-fg32
cmake ..\flightgear -G "Visual Studio 14" ^ cmake ..\flightgear -G "Visual Studio 14" ^
-DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
-DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 ^
-DCMAKE_PREFIX_PATH:PATH=%OSG32% ^
-DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^
@@ -44,16 +43,13 @@ cmake ..\flightgear -G "Visual Studio 14" ^
-DENABLE_COMPOSITOR:BOOL=OFF -DENABLE_COMPOSITOR:BOOL=OFF
cmake --build . --config RelWithDebInfo --target INSTALL cmake --build . --config RelWithDebInfo --target INSTALL
md %WORKSPACE%/install/msvc140/compositor
cd ..\build-fg32-compositor cd ..\build-fg32-compositor
cmake ..\flightgear -G "Visual Studio 14" ^ cmake ..\flightgear -G "Visual Studio 14" ^
-DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
-DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140/compositor ^ -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 ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^
-DFG_BUILD_TYPE=%FGBUILDTYPE% ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-DENABLE_SWIFT:BOOL=ON ^ -DENABLE_SWIFT:BOOL=ON ^
-DENABLE_COMPOSITOR:BOOL=ON -DENABLE_COMPOSITOR:BOOL=ON
@@ -87,9 +83,6 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
-DENABLE_COMPOSITOR:BOOL=OFF -DENABLE_COMPOSITOR:BOOL=OFF
cmake --build . --config RelWithDebInfo --target INSTALL cmake --build . --config RelWithDebInfo --target INSTALL
md %WORKSPACE%/install/msvc140-64/compositor
cd ..\build-fg64-compositor cd ..\build-fg64-compositor
cmake ..\flightgear -G "Visual Studio 14 Win64" ^ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
-DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^