summaryrefslogtreecommitdiff
path: root/library/CMakeLists.txt
diff options
context:
space:
mode:
authorTimothy Collett2012-05-29 14:44:37 -0400
committerTimothy Collett2012-05-29 14:44:37 -0400
commit20a00f53c4a6b4f105c09be9730892e0898e71d1 (patch)
tree9110aefe1bb20fd7db867fc079401c3ac60f6279 /library/CMakeLists.txt
parent7ec0fd6fc02815d6093cdff97599226045657053 (diff)
downloaddfhack-20a00f53c4a6b4f105c09be9730892e0898e71d1.tar.gz
dfhack-20a00f53c4a6b4f105c09be9730892e0898e71d1.tar.bz2
dfhack-20a00f53c4a6b4f105c09be9730892e0898e71d1.tar.xz
When built with the right compiler, we don't need any Obj-C code.
Diffstat (limited to 'library/CMakeLists.txt')
-rw-r--r--library/CMakeLists.txt35
1 files changed, 2 insertions, 33 deletions
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 1e664b81..c0e4b010 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -49,10 +49,6 @@ SET(MAIN_HEADERS_WINDOWS
include/wdirent.h
)
-SET(MAIN_HEADERS_DARWIN
-MacPool.h
-)
-
SET(MAIN_SOURCES
Core.cpp
ColorText.cpp
@@ -95,13 +91,9 @@ Process-linux.cpp
SET(MAIN_SOURCES_DARWIN
Console-darwin.cpp
-Hooks-darwin.cpp
PlugLoad-darwin.cpp
Process-darwin.cpp
-)
-
-SET(OBJC_SOURCES_DARWIN
-MacPool.mm
+Hooks-darwin.cpp
)
SET(MAIN_SOURCES_LINUX_EGGY
@@ -172,11 +164,6 @@ IF(UNIX)
LIST(APPEND PROJECT_SOURCES ${MAIN_SOURCES_LINUX_EGGY})
ELSEIF(APPLE)
LIST(APPEND PROJECT_SOURCES ${MAIN_SOURCES_DARWIN})
- SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -m32 -march=i686 -mtune=generic")
- SET(CPP_SOURCES)
- LIST(APPEND CPP_SOURCES ${PROJECT_SOURCES})
- LIST(APPEND PROJECT_SOURCES ${OBJC_SOURCES_DARWIN})
- LIST(APPEND PROJECT_HEADERS ${MAIN_HEADERS_DARWIN})
ELSE()
LIST(APPEND PROJECT_SOURCES ${MAIN_SOURCES_LINUX})
ENDIF()
@@ -231,24 +218,6 @@ ELSE(WIN32)
PROPERTIES COMPILE_FLAGS "/O1 /bigobj")
ENDIF()
-if(APPLE)
- SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -m32 -mtune=generic" )
- foreach(f ${PROJECT_SOURCES})
- if(f MATCHES MacPool.mm)
- MESSAGE(STATUS "Not setting properties for ${f}")
- SET_SOURCE_FILES_PROPERTIES(${f} PROPERTIES COMPILE_FLAGS "-arch i386 -framework Foundation -x objective-c")
- else()
- if(f MATCHES MacPool.h)
- else()
- SET_SOURCE_FILES_PROPERTIES(${f} PROPERTIES COMPILE_FLAGS "-std=c++0x -march=i686")
- MESSAGE(STATUS "Setting properties for ${f}")
- endif()
- endif()
- endforeach()
- SET_SOURCE_FILES_PROPERTIES(dfhack-run.cpp PROPERTIES COMPILE_FLAGS "-std=c++0x -march=i686")
- SET(CMAKE_SHARED_LINKER_FLAGS "-arch i386")
-endif()
-
# Compilation
ADD_DEFINITIONS(-DBUILD_DFHACK_LIB)
@@ -263,7 +232,6 @@ IF(UNIX)
SET(PROJECT_LIBS rt dl dfhack-md5 dfhack-tinyxml dfhack-tinythread)
IF(APPLE)
SET(PROJECT_LIBS dl dfhack-md5 dfhack-tinyxml dfhack-tinythread)
-# include_directories(${CMAKE_INSTALL_PREFIX}/libs/SDL.framework/Headers)
ENDIF()
ELSE(WIN32)
#FIXME: do we really need psapi?
@@ -301,6 +269,7 @@ IF(APPLE)
SET(SDL_LIBRARY ${CMAKE_INSTALL_PREFIX}/libs/SDL.framework)
TARGET_LINK_LIBRARIES(dfhack ${SDL_LIBRARY})
TARGET_LINK_LIBRARIES(dfhack /System/Library/Frameworks/Foundation.framework)
+ TARGET_LINK_LIBRARIES(dfhack /usr/lib/libc++.dylib)
SET_TARGET_PROPERTIES(dfhack PROPERTIES VERSION 1.0.0)
SET_TARGET_PROPERTIES(dfhack PROPERTIES SOVERSION 1.0.0)
ENDIF()