Skip to content
Permalink
Browse files

Fix OSX packaging finally

Signed-off-by: Craig Robbins <kde.psych@gmail.com>
  • Loading branch information...
neoascetic authored and Zeno- committed Dec 15, 2014
1 parent 8661b35 commit 3b902fd574bfba74ebbd58369dce74162385b410
Showing with 18 additions and 6 deletions.
  1. +3 −5 CMakeLists.txt
  2. +14 −0 misc/Info.plist
  3. BIN misc/minetest-icon.icns
  4. +1 −1 src/porting.cpp
@@ -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")
@@ -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>
Binary file not shown.
@@ -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
{

0 comments on commit 3b902fd

Please sign in to comment.
You can’t perform that action at this time.