diff options
| author | Pavel Puchkin <i@neoascetic.me> | 2014-12-15 17:32:08 +0200 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2014-12-16 20:33:54 +1000 |
| commit | 3b902fd574bfba74ebbd58369dce74162385b410 (patch) | |
| tree | 91d08a094f69c7366a548db270982871bb5455f7 | |
| parent | 8661b3587b4854f18f747a5577d0bb62998e569d (diff) | |
| download | minetest-3b902fd574bfba74ebbd58369dce74162385b410.tar.gz minetest-3b902fd574bfba74ebbd58369dce74162385b410.tar.bz2 minetest-3b902fd574bfba74ebbd58369dce74162385b410.zip | |
Fix OSX packaging finally
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | misc/Info.plist | 14 | ||||
| -rw-r--r-- | misc/minetest-icon.icns | bin | 0 -> 242668 bytes | |||
| -rw-r--r-- | src/porting.cpp | 2 |
4 files changed, 18 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bfd4c911..8245e7037 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ if(WIN32) set(LOCALEDIR "locale") elseif(APPLE) set(SHAREDIR ".") - set(BINDIR "./bin") + set(BINDIR ".") set(DOCDIR "./doc/${PROJECT_NAME}") set(EXAMPLE_CONF_DIR ${DOCDIR}) set(LOCALEDIR "locale") @@ -213,13 +213,11 @@ if(WIN32) # This might be needed for some installer #set(CPACK_PACKAGE_EXECUTABLES bin/minetest.exe "Minetest" bin/minetestserver.exe "Minetest Server") elseif(APPLE) - # see http://cmake.org/Wiki/CMake:CPackPackageGenerators#Bundle_.28OSX_only.29 set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-osx") - set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/misc/mac/minetest-icon.icns) + set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.icns) set(CPACK_BUNDLE_NAME ${PROJECT_NAME}) set(CPACK_BUNDLE_ICON ${CPACK_PACKAGE_ICON}) - set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/misc/mac/Info.plist) - set(CPACK_BUNDLE_STARTUP_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/misc/mac/minetest-mac.sh) + set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/misc/Info.plist) set(CPACK_GENERATOR "Bundle") else() set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux") diff --git a/misc/Info.plist b/misc/Info.plist new file mode 100644 index 000000000..848ccfa30 --- /dev/null +++ b/misc/Info.plist @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>../Resources/minetest</string> + <key>CFBundleIconFile</key> + <string>minetest.icns</string> + <key>CFBundleIdentifier</key> + <string>net.minetest.minetest</string> +</dict> +</plist> diff --git a/misc/minetest-icon.icns b/misc/minetest-icon.icns Binary files differnew file mode 100644 index 000000000..14731c2c1 --- /dev/null +++ b/misc/minetest-icon.icns diff --git a/src/porting.cpp b/src/porting.cpp index e1a062ecd..025e5978c 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -528,7 +528,7 @@ void initializePaths() { dstream<<"Bundle resource path: "<<path<<std::endl; //chdir(path); - path_share = std::string(path) + DIR_DELIM + "share"; + path_share = std::string(path) + DIR_DELIM + STATIC_SHAREDIR; } else { |