fly/fgmeta
1
0
Fork 0
Code Activity

Put compositor back off for now

Browse source 
Need to figure out a way to handle it as another binary build, since
there is no runtime configuration option.
This commit is contained in:
James Turner 2019-05-24 13:55:59 +01:00
parent abc616b548
commit 09cc52296d
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_release_linux.sh
View file

@ -41,7 +41,7 @@ cp simgear-*.tar.bz2 ../output/.
#####################################################################################
echo "Starting on FlightGear"
cd ../fgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_COMPOSITOR:BOOL=ON -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
# compile
make

2
build_release_windows.bat
View file

@ -38,7 +38,6 @@ cmake ..\flightgear -G "Visual Studio 14" ^
-DOSG_FSTREAM_EXPORT_FIXED=1 ^
-DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^
-DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-DENABLE_COMPOSITOR:BOOL=ON ^
-DENABLE_SWIFT:BOOL=ON
cmake --build . --config RelWithDebInfo --target INSTALL
@ -65,7 +64,6 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
-DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^
-DOSG_FSTREAM_EXPORT_FIXED=1 ^
-DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-DENABLE_COMPOSITOR:BOOL=ON ^
-DENABLE_SWIFT:BOOL=ON
cmake --build . --config RelWithDebInfo --target INSTALL

2
hudson_mac_build_release.sh
View file

@ -46,7 +46,7 @@ else
FGBUILDTYPE=Nightly
fi
cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_SWIFT:BOOL=ON -DENABLE_COMPOSITOR:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear
cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_SWIFT:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear
make