diff options
| author | Manolo Gouy <Manolo> | 2010-11-17 16:47:54 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-11-17 16:47:54 +0000 |
| commit | c077050d05eeb4afb6af9610889d5829a9cbfbce (patch) | |
| tree | 7891b4a91130f2ffcdebb9e34574d4730674cd9d | |
| parent | bc66ca62648bf6195dada106ac2ef843b2ff79db (diff) | |
Fixed cmake under Mac OS X
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7867 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | configh.cmake.in | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 33552a16a..e5a14fe1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,11 @@ include(TestBigEndian) 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) diff --git a/configh.cmake.in b/configh.cmake.in index f422ad548..5db4dbeab 100644 --- a/configh.cmake.in +++ b/configh.cmake.in @@ -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__@ /* |