Skip to content
Snippets Groups Projects
Commit 0ef597c1 authored by Oliver Bock's avatar Oliver Bock
Browse files

Patch no longer required (included upstream, see 84f210)

parent bd1a1900
No related branches found
No related tags found
No related merge requests found
...@@ -338,9 +338,6 @@ build_generic_win32() ...@@ -338,9 +338,6 @@ build_generic_win32()
FREETYPE2_INCLUDE_DIR="$ROOT/install/include" FREETYPE2_INCLUDE_DIR="$ROOT/install/include"
FREETYPE2_LIBRARIES="$ROOT/install/lib/libfreetype.a" FREETYPE2_LIBRARIES="$ROOT/install/lib/libfreetype.a"
patch CMakeLists.txt < $ROOT/patches/CMakeLists.txt.oglft.patch >> $LOGFILE 2>&1 || failure patch CMakeLists.txt < $ROOT/patches/CMakeLists.txt.oglft.patch >> $LOGFILE 2>&1 || failure
# patch: build static lib instead of shared
cd $ROOT/3rdparty/oglft/liboglft || failure
patch CMakeLists.txt < $ROOT/patches/CMakeLists.txt.liboglft.patch >> $LOGFILE 2>&1 || failure
cp $ROOT/patches/toolchain-linux-mingw.oglft.cmake $ROOT/build/oglft >> $LOGFILE 2>&1 || failure cp $ROOT/patches/toolchain-linux-mingw.oglft.cmake $ROOT/build/oglft >> $LOGFILE 2>&1 || failure
export OGLFT_INSTALL=$ROOT/install export OGLFT_INSTALL=$ROOT/install
echo "Building OGLFT..." | tee -a $LOGFILE echo "Building OGLFT..." | tee -a $LOGFILE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment