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

Patch no longer required (included upstream)

parent 9faec1c2
No related branches found
No related tags found
No related merge requests found
......@@ -245,9 +245,6 @@ build_generic()
FREETYPE2_INCLUDE_DIR="$ROOT/install/include"
FREETYPE2_LIBRARIES="$ROOT/install/lib/libfreetype.a"
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
echo "Building OGLFT..." | tee -a $LOGFILE
cd $ROOT/build/oglft || failure
# TODO: do we wanna create universal binaries on mac? If so, add -DCMAKE_OSX_ARCHITECTURES=ppc;i386
......
--- CMakeLists.txt
+++ CMakeLists.txt 2008-05-19 11:42:02.000000000 +0200
@@ -20,7 +20,7 @@
add_definitions( -DOGLFT_BUILD )
endif( WIN32 )
-add_library( oglft SHARED ${sources} )
+add_library( oglft STATIC ${sources} )
target_link_libraries(
oglft
${FREETYPE2_LIBRARIES}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment