diff --git a/build.sh b/build.sh index 1b6efbccaf6e5411495ec97c3a699dd1e6864933..5143a65b15ee1cf2764a42179e0bd585e95e763e 100755 --- a/build.sh +++ b/build.sh @@ -230,10 +230,6 @@ build_generic() # 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 - if [ "$1" == "$TARGET_MAC" ]; then - # patch: enable Mac OS support - patch OGLFT.h.cmake < $ROOT/patches/OGLFT.h.cmake.macos.patch >> $LOGFILE 2>&1 || failure - fi 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/OGLFT.h.cmake.macos.patch b/patches/OGLFT.h.cmake.macos.patch deleted file mode 100644 index 5308b2777070b7056869d8d73ebcffe9e56244af..0000000000000000000000000000000000000000 --- a/patches/OGLFT.h.cmake.macos.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- OGLFT.h.cmake -+++ OGLFT.h.cmake.new 2008-05-23 13:20:10.000000000 +0200 -@@ -42,12 +42,21 @@ - #include <windows.h> - #endif - -+#ifdef __APPLE__ -+#include <OpenGL/gl.h> -+#include <OpenGL/glu.h> -+#else - #include <GL/gl.h> - #include <GL/glu.h> -+#endif - - #ifndef OGLFT_NO_SOLID -+#ifdef __APPLE__ -+#include <OpenGL/gle.h> -+#else - #include <GL/gle.h> - #endif -+#endif - - #ifndef OGLFT_NO_QT - #define OGLFT_QT_VERSION @DESIRED_QT_VERSION@ -@@ -97,7 +106,11 @@ - }; - - //! Callback from GLU tessellation routines. -+#ifdef __APPLE__ -+ typedef GLvoid (*GLUTessCallback)(...); -+#else - typedef void (*GLUTessCallback)(); -+#endif - - //! The FreeType library instance. - /*!