diff options
| author | Thomas Huth <huth@users.berlios.de> | 2010-05-22 22:53:52 (GMT) |
|---|---|---|
| committer | Thomas Huth <huth@users.berlios.de> | 2010-05-22 22:53:52 (GMT) |
| commit | 51812208ebd44d6a7d591f52b6732767d9bb3afb (patch) | |
| tree | 545c27c7f499289b63537ae53d7cf863211b32ed | |
| parent | 412a0363158f560b8d029a4d6e924daf0abba194 (diff) | |
| download | hatari-51812208ebd44d6a7d591f52b6732767d9bb3afb.zip hatari-51812208ebd44d6a7d591f52b6732767d9bb3afb.tar.gz | |
CMakeLists.txt updates for building on OS X
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 19 |
2 files changed, 23 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89b9345..6d10e3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR) project(Hatari) +SET(APP_NAME "Hatari") + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") include(CheckIncludeFiles) @@ -16,6 +18,8 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif(NOT CMAKE_BUILD_TYPE) +# set(CMAKE_VERBOSE_MAKEFILE 1) + # ########################## # Conditional build features # ########################## @@ -30,6 +34,11 @@ set(ENABLE_SMALL_MEM 0 if(APPLE) set(ENABLE_OSX_BUNDLE 1 CACHE BOOL "Built Hatari as Mac OS X application bundle") + set(CMAKE_OSX_ARCHITECTURES "i386;ppc" CACHE STRING "Target architectures" FORCE) + # set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" CACHE STRING "10.6 SDK" FORCE) + # set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "Target Min 10.5" FORCE) + set(ADDITIONAL_INCLUDES ${FRAMEWORKS}) + set_source_files_properties(${FRAMEWORKS} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks) else() set(ENABLE_OSX_BUNDLE 0 CACHE BOOL "Built Hatari as Mac OS X application bundle") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ebd2d2..2401400 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,8 +21,7 @@ if(ENABLE_OSX_BUNDLE) gui-osx/CreateFloppyController.m gui-osx/SDLMain.m) set_source_files_properties(${GUIOSX_SOURCES} PROPERTIES LANGUAGE C) set(GUIOSX_RSRCS - gui-osx/SDLMain.nib gui-osx/Hatari.icns - gui-osx/English.lproj gui-osx/French.lproj) + gui-osx/Hatari.icns gui-osx/English.lproj gui-osx/French.lproj) endif(ENABLE_OSX_BUNDLE) # When building for Windows, define specific sources for gui and ressources @@ -56,12 +55,22 @@ add_subdirectory(uae-cpu) # When building for OSX, add specific sources if(ENABLE_OSX_BUNDLE) - set_source_files_properties(${GUIOSX_RSRCS} - PROPERTIES MACOSX_PACKAGE_LOCATION Resources) add_executable(hatari MACOSX_BUNDLE ${GUIOSX_RSRCS} ${SOURCES} ${GUIOSX_SOURCES}) - # set_target_properties(hatari PROPERTIES MACOSX_BUNDLE true) set_target_properties(hatari PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/Info-Hatari.plist) + set(MACOSX_BUNDLE_ICON_FILE Hatari.icns) + # Create Hatari.app bundle + add_custom_target(osx_bundle_dirs + COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/Hatari.app/Contents/Resources + COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/Hatari.app/Contents/MacOS + COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/${MACOSX_BUNDLE_ICON_FILE} + ${CMAKE_CURRENT_BINARY_DIR}/Hatari.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} + # Copy Localized .nib to Bundle + COMMAND cp -R ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/*.lproj ${CMAKE_CURRENT_BINARY_DIR}/Hatari.app/Contents/Resources/ + ) + add_dependencies(hatari osx_bundle_dirs) + set_source_files_properties(${GUIOSX_RSRCS} + PROPERTIES MACOSX_PACKAGE_LOCATION Resources) # When building for Windows, add specific sources + method to compile .rc files elseif(WIN32) |