Author: manolo
Date: 2010-11-17 08:47:54 -0800 (Wed, 17 Nov 2010)
New Revision: 7867
Log:
Fixed cmake under Mac OS X
Modified:
branches/branch-1.3/CMakeLists.txt
branches/branch-1.3/configh.cmake.in
Modified: branches/branch-1.3/CMakeLists.txt
===================================================================
--- branches/branch-1.3/CMakeLists.txt 2010-11-17 11:28:58 UTC (rev 7866)
+++ branches/branch-1.3/CMakeLists.txt 2010-11-17 16:47:54 UTC (rev 7867)
@@ -83,7 +83,11 @@
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
if(APPLE)
- set(USE_QUARTZ ON)
+ set(__APPLE_QUARTZ__ 1)
+ set(HAVE_STRTOLL 1)
+ set(HAVE_STRCASECMP 1)
+ set(HAVE_DIRENT_H 1)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa
-framework Carbon -framework AudioToolBox")
endif(APPLE)
if(WIN32)
Modified: branches/branch-1.3/configh.cmake.in
===================================================================
--- branches/branch-1.3/configh.cmake.in 2010-11-17 11:28:58 UTC (rev
7866)
+++ branches/branch-1.3/configh.cmake.in 2010-11-17 16:47:54 UTC (rev
7867)
@@ -117,19 +117,14 @@
#define USE_XDBE HAVE_XDBE
/*
- * USE_QUARTZ:
+ * __APPLE_QUARTZ__:
*
- * Use Quartz instead of Quickdraw on Apple Mac OS X machines.
- * FLTK was originally ported to Quickdraw which is no longer
- * supported by Apple. If USE_QUARTZ is defined, FLTK will be
- * compiled using Quartz instead. This flag has no meaning on
- * other operating systems.
+ * If __APPLE_QUARTZ__ is defined, FLTK will be
+ * compiled using Quartz. This flag has no meaning on
+ * other operating systems than Mac OS X.
*/
-#cmakedefine USE_QUARTZ
#cmakedefine __APPLE_QUARTZ__ @__APPLE_QUARTZ__@
-#cmakedefine __APPLE_COCOA__ @__APPLE_COCOA__@
-#cmakedefine __APPLE_QD__ @__APPLE_QD__@
/*
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
