summaryrefslogtreecommitdiff
path: root/FL/math.h
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2010-04-14 20:17:44 +0000
committerMatthias Melcher <fltk@matthiasm.com>2010-04-14 20:17:44 +0000
commit30d00ceb075adaa945a5176a3272982a856f0a9b (patch)
tree8eb8bcd198f8166516bb36b81c7ccf2a9c2091ff /FL/math.h
parent79b2c201a0d36651e97140ddff215a3b1bbde93e (diff)
Fludi IDE: now supporting header files for OS X. If those are included for a library, the resulting framework will receive a copy of the headers, allowing Xcode to simply include the file into any new project. frameworks must be installed in /Library?Frameworks to be found automatically. A little more fixing is required.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7504 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/math.h')
-rw-r--r--FL/math.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/FL/math.h b/FL/math.h
index f453c0a56..b3b4c7cac 100644
--- a/FL/math.h
+++ b/FL/math.h
@@ -25,15 +25,18 @@
// http://www.fltk.org/str.php
//
+// Xcode on OS X includes files by recursing down into directories.
+// This code catches the cycle and directly includes the required file.
+#ifdef fl_math_h_cyclic_include
+# include "/usr/include/math.h"
+#endif
+
#ifndef fl_math_h
# define fl_math_h
-// Apple's ProjectBuilder has the nasty habit of including recursively
-// down the file tree. To avoid re-including <FL/math.h> we must
-// directly include the systems math file. (Plus, I could not find a
-// predefined macro for ProjectBuilder builds, so we have to define it
-// in the project)
+# define fl_math_h_cyclic_include
# include <math.h>
+# undef fl_math_h_cyclic_include
# ifdef __EMX__
# include <float.h>