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

Enable compositor in nightly builds

Browse Source
This commit is contained in:
James Turner
2019-05-23 12:38:02 +01:00
parent 2277ba38c7
commit c3b9b9a524
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_release_linux.sh
+1 -1
View File
@@ -41,7 +41,7 @@ cp simgear-*.tar.bz2 ../output/.
##################################################################################### #####################################################################################
echo "Starting on FlightGear" echo "Starting on FlightGear"
cd ../fgBuild cd ../fgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DFG_BUILD_TYPE=Release ../flightgear cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_COMPOSITOR:BOOL=ON DFG_BUILD_TYPE=Release ../flightgear
# compile # compile
make make
build_release_windows.bat
+4 -2
View File
@@ -37,7 +37,8 @@ cmake ..\flightgear -G "Visual Studio 14" ^
-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% ^
-DFG_BUILD_TYPE=%FGBUILDTYPE% -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-DENABLE_COMPOSITOR:BOOL=ON
cmake --build . --config RelWithDebInfo --target INSTALL cmake --build . --config RelWithDebInfo --target INSTALL
cd .. cd ..
@@ -62,7 +63,8 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
-DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 ^
-DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^ -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^
-DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-DFG_BUILD_TYPE=%FGBUILDTYPE% -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-DENABLE_COMPOSITOR:BOOL=ON
cmake --build . --config RelWithDebInfo --target INSTALL cmake --build . --config RelWithDebInfo --target INSTALL
cd .. cd ..
hudson_mac_build_release.sh
+1 -1
View File
@@ -46,7 +46,7 @@ else
FGBUILDTYPE=Nightly FGBUILDTYPE=Nightly
fi fi
cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_COMPOSITOR:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear
make make