From a881b6b0bc94e770b4f7706e4587360d471509be Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver@Bruce-Allens-Computer.local>
Date: Mon, 6 Oct 2008 12:02:54 +0200
Subject: [PATCH] Patch no longer required (included upstream)
---
build.sh | 3 ---
patches/CMakeLists.txt.liboglft.patch | 11 -----------
2 files changed, 14 deletions(-)
delete mode 100644 patches/CMakeLists.txt.liboglft.patch
diff --git a/build.sh b/build.sh
index efe7706..ae9d55b 100755
--- a/build.sh
+++ b/build.sh
@@ -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
diff --git a/patches/CMakeLists.txt.liboglft.patch b/patches/CMakeLists.txt.liboglft.patch
deleted file mode 100644
index 5760218..0000000
--- a/patches/CMakeLists.txt.liboglft.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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}
--
GitLab