From c90b114ac90ab4a2f1bf79480a5526518b701300 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 22 Jan 2012 19:19:02 +0100 Subject: [PATCH] Update downl_and_comp script to version of Francesco Brisa --- download_and_compile.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 download_and_compile.sh diff --git a/download_and_compile.sh b/download_and_compile.sh old mode 100644 new mode 100755 index e8415cd..a515342 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -18,7 +18,7 @@ # along with this program. If not, see . -VERSION="1.7" +VERSION="1.8" #COMPILE GIT FGFS @@ -696,6 +696,12 @@ then echo -n "RECONFIGURE FGFS ... " >> $LOGFILE rm -f CMakeCache.txt + + # REMOVING BAD LINES IN CMakeLists.txt + #echo "REMOVING BAD LINES IN CMakeLists.txt" + #cat utils/fgadmin/src/CMakeLists.txt | sed /X11_Xft_LIB/d | sed /X11_Xinerama_LIB/d > utils/fgadmin/src/CMakeLists_without_err.txt + #cp -f utils/fgadmin/src/CMakeLists_without_err.txt utils/fgadmin/src/CMakeLists.txt + cmake -D CMAKE_BUILD_TYPE="Release" -D "WITH_FGPANEL=OFF" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" . 2>&1 | tee -a $LOGFILE