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

Remove Mac OS patch for OGLFT

* It's now integrated upstream
* OGLFT svn revision: 108
parent ebcc2017
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
--- 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.
/*!
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment