]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
macos: produce working NetRadiant.app
authorThomas Debesse <dev@illwieckz.net>
Tue, 22 Dec 2020 22:12:02 +0000 (23:12 +0100)
committerThomas Debesse <dev@illwieckz.net>
Tue, 22 Dec 2020 22:53:06 +0000 (23:53 +0100)
19 files changed:
CMakeLists.txt
bundle/CMakeLists.txt
contrib/CMakeLists.txt
library-bundler
plugins/CMakeLists.txt
setup/apple/Contents/Info.plist [new file with mode: 0644]
setup/apple/Contents/Resources/netradiant.icns [new file with mode: 0644]
setup/apple/Makefile [deleted file]
setup/apple/NetRadiant.app/Contents/Info.plist [deleted file]
setup/apple/NetRadiant.app/Contents/MacOS/netradiant [deleted file]
setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf [deleted file]
setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc [deleted file]
setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc [deleted file]
setup/apple/NetRadiant.app/Contents/Resources/lib/.turd [deleted file]
setup/apple/NetRadiant.app/Contents/Resources/netradiant.icns [deleted file]
setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd [deleted file]
setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd [deleted file]
setup/apple/README.md [deleted file]
setup/apple/netradiant [new file with mode: 0755]

index 05ba8a3fcbd90e79f142d6709e5a62a603c5626b..b17ed2b197f3b8956387ac8ffb7f1fa2ac0526a3 100644 (file)
@@ -70,6 +70,26 @@ if (BUILD_RADIANT OR BUILD_TOOLS)
     set(BUILD_BINARIES ON)
 endif ()
 
+if (BUILD_BINARIES)
+    if (WIN32 OR APPLE OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+        set(BUNDLING_SUPPORTED ON)
+    endif()
+
+    if (BUNDLING_SUPPORTED)
+        if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
+            set(BUNDLE_LIBRARIES_DEFAULT ON)
+        else ()
+            set(BUNDLE_LIBRARIES_DEFAULT OFF)
+        endif ()
+
+        option(BUNDLE_LIBRARIES "Bundle libraries" ${BUNDLE_LIBRARIES_DEFAULT})
+    endif ()
+
+    if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED)
+        set(FHS_INSTALL OFF CACHE PATH "Disabled because of BUNDLE_LIBRARIES" FORCE)
+    endif ()
+endif ()
+
 #-----------------------------------------------------------------------
 # Paths
 #-----------------------------------------------------------------------
@@ -78,19 +98,32 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install" CACHE PATH "..." FORCE)
 endif ()
 
+if (APPLE)
+       set(APPLE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/NetRadiant.app)
+       set(FINAL_INSTALL_PREFIX ${APPLE_INSTALL_PREFIX}/Contents/Prefix)
+else ()
+       set(FINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+endif ()
+
 set(RADIANT_NAME "NetRadiant" CACHE INTERNAL "...")
 add_definitions(-DRADIANT_NAME="${RADIANT_NAME}")
 set(RADIANT_BASENAME "netradiant" CACHE INTERNAL "...")
 add_definitions(-DRADIANT_BASENAME="${RADIANT_BASENAME}")
 
-set(RADIANT_LIB_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...")
-set(RADIANT_BIN_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...")
-set(RADIANT_DATA_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...")
+set(RADIANT_BIN_DIR ${FINAL_INSTALL_PREFIX} CACHE INTERNAL "...")
+set(RADIANT_LIB_DIR ${FINAL_INSTALL_PREFIX}/lib CACHE INTERNAL "...")
+set(RADIANT_ADDONS_DIR ${FINAL_INSTALL_PREFIX} CACHE INTERNAL "...")
+set(RADIANT_ETC_DIR ${FINAL_INSTALL_PREFIX}/etc CACHE INTERNAL "...")
+set(RADIANT_SHARE_DIR ${FINAL_INSTALL_PREFIX}/share CACHE INTERNAL "...")
+set(RADIANT_DATA_DIR ${FINAL_INSTALL_PREFIX} CACHE INTERNAL "...")
 
 if (FHS_INSTALL AND NOT BUNDLE_LIBRARIES)
-    set(RADIANT_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/${RADIANT_BASENAME})
-    set(RADIANT_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-    set(RADIANT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${RADIANT_BASENAME})
+    set(RADIANT_BIN_DIR ${FINAL_INSTALL_PREFIX}/bin)
+    set(RADIANT_LIB_DIR ${FINAL_INSTALL_PREFIX}/lib)
+    set(RADIANT_ADDONS_DIR ${RADIANT_LIB_DIR}/${RADIANT_BASENAME})
+    set(RADIANT_ETC_DIR ${FINAL_INSTALL_PREFIX}/etc)
+    set(RADIANT_SHARE_DIR ${FINAL_INSTALL_PREFIX}/share)
+    set(RADIANT_DATA_DIR ${RADIANT_SHARE_DIR}/${RADIANT_BASENAME})
 endif ()
 
 set(GAMEPACKS_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/download CACHE PATH "Where to store downloaded game packs")
@@ -273,26 +306,6 @@ if (BUILD_BINARIES)
     include_directories("${PROJECT_SOURCE_DIR}/include")
     include_directories("${PROJECT_SOURCE_DIR}/libs")
 
-    if (WIN32 OR APPLE OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-        set(BUNDLING_SUPPORTED ON)
-    endif()
-
-    if (BUNDLING_SUPPORTED)
-        if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
-            set(BUNDLE_LIBRARIES_DEFAULT ON)
-        else ()
-            set(BUNDLE_LIBRARIES_DEFAULT OFF)
-        endif ()
-
-        option(BUNDLE_LIBRARIES "Bundle libraries" ${BUNDLE_LIBRARIES_DEFAULT})
-    endif ()
-
-    if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED)
-        add_subdirectory(bundle)
-
-        set(FHS_INSTALL OFF CACHE PATH "Disabled because of BUNDLE_LIBRARIES" FORCE)
-    endif ()
-
     macro (copy_dlls target)
         if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED)
             add_custom_command(TARGET ${target} POST_BUILD
@@ -305,6 +318,16 @@ if (BUILD_BINARIES)
     endmacro ()
 endif ()
 
+#-----------------------------------------------------------------------
+# Bundle
+#-----------------------------------------------------------------------
+
+if (BUILD_BINARIES)
+    if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED)
+        add_subdirectory(bundle)
+    endif ()
+endif ()
+
 #-----------------------------------------------------------------------
 # Builtins: targets
 #-----------------------------------------------------------------------
@@ -462,30 +485,35 @@ if (BUILD_BINARIES)
 endif ()
 
 if (DOWNLOAD_GAMEPACKS)
-    if (FHS_INSTALL)
-       set(GAME_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share/netradiant")
-    else ()
-       set(GAME_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-    endif ()
-
     install(DIRECTORY
         ${PROJECT_BINARY_DIR}/gamepacks
         DESTINATION ${RADIANT_DATA_DIR}
     )
 endif ()
 
-if(BUILD_BINARIES AND FHS_INSTALL AND NOT WIN32 AND NOT APPLE)
+if (BUILD_BINARIES AND FHS_INSTALL AND NOT WIN32 AND NOT APPLE)
     install(FILES
         ${PROJECT_SOURCE_DIR}/icons/netradiant.png
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
+        DESTINATION ${RADIANT_SHARE_DIR}/pixmaps
     )
     install(FILES
         ${PROJECT_SOURCE_DIR}/icons/netradiant.desktop
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
+        DESTINATION ${RADIANT_SHARE_DIR}/applications
     )
     install(FILES
         ${PROJECT_SOURCE_DIR}/icons/mime/map.xml
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/model
+        DESTINATION ${RADIANT_SHARE_DIR}/mime/model
+    )
+endif ()
+
+if (APPLE)
+    install(DIRECTORY
+        setup/apple/Contents
+        DESTINATION ${APPLE_INSTALL_PREFIX}
+    )
+    install(PROGRAMS
+        setup/apple/netradiant
+        DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/MacOS
     )
 endif ()
 
index 73750b7031e222b09e9ffbb96ea330794925df53..f899cee009ee1308bedc7fcbfcaf47d5a5a52da6 100644 (file)
@@ -3,6 +3,8 @@ if (WIN32)
     set(BUNDLE_SHARE ON)
 elseif (APPLE)
     set(BUNDLE_OS_NAME "macos")
+    set(BUNDLE_SHARE ON)
+    set(BUNDLE_ETC ON)
 elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(BUNDLE_OS_NAME "linux")
 else ()
@@ -20,12 +22,19 @@ add_custom_target(bundle ALL
 
 install(DIRECTORY
     ${PROJECT_BINARY_DIR}/lib
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    DESTINATION ${FINAL_INSTALL_PREFIX}
 )
 
 if (BUNDLE_SHARE)
     install(DIRECTORY
         ${PROJECT_BINARY_DIR}/share
-        DESTINATION ${CMAKE_INSTALL_PREFIX}
+        DESTINATION ${FINAL_INSTALL_PREFIX}
+    )
+endif ()
+
+if (BUNDLE_ETC)
+    install(DIRECTORY
+        ${PROJECT_BINARY_DIR}/etc
+        DESTINATION ${FINAL_INSTALL_PREFIX}
     )
 endif ()
index f2515bf8bb235d8f91e7db81b88fa34619d96472..6fbe90a9eabde0782defc700ffd560cfc6590d73 100644 (file)
@@ -8,7 +8,7 @@ macro(radiant_plugin name)
     copy_dlls(${name})
     install(
             TARGETS ${name}
-            LIBRARY DESTINATION ${RADIANT_LIB_DIR}/plugins
+            LIBRARY DESTINATION ${RADIANT_ADDONS_DIR}/plugins
     )
 endmacro()
 
index 9a48a626cdda0f9da6bf20a113499b18df2c2342..62f48f12784bfe025c1bd779ff3861c147d913cf 100755 (executable)
@@ -148,7 +148,7 @@ Multi::getGtkThemeName () {
                        echo 'MS-Windows'
                        ;;
                *)
-                       echo 'Default'
+                       echo 'Raleigh'
                        ;;
        esac
 }
@@ -217,6 +217,9 @@ Multi::getGtkDeps () {
                        ;;
                'macos')
                        cat <<-EOF
+                       etc/fonts
+                       share/themes/${gtk_theme_name}/gtk-2.0
+                       share/fontconfig
                        share/icons/hicolor
                        share/locale
                        ${lib_prefix}/gdk-pixbuf-2.0
index b3d2909174cfe8490633cdb2767f04b0f356e528..8db4b7fa212ea1010dea0fea6eb11927da510765 100644 (file)
@@ -8,7 +8,7 @@ macro(radiant_plugin name)
     copy_dlls(${name})
     install(
             TARGETS ${name}
-            LIBRARY DESTINATION ${RADIANT_LIB_DIR}/modules
+            LIBRARY DESTINATION ${RADIANT_ADDONS_DIR}/modules
     )
 endmacro()
 
diff --git a/setup/apple/Contents/Info.plist b/setup/apple/Contents/Info.plist
new file mode 100644 (file)
index 0000000..2b34323
--- /dev/null
@@ -0,0 +1,28 @@
+<?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>CFBundleDisplayName</key>
+        <string>NetRadiant</string>
+        <key>CFBundleExecutable</key>
+        <string>netradiant</string>
+        <key>CFBundleIconFile</key>
+        <string>netradiant.icns</string>
+        <key>CFBundleIdentifier</key>
+        <string>org.xonotic.netradiant</string>
+        <key>CFBundleName</key>
+        <string>NetRadiant</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.5.0</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1.5.0</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.7</string>
+</dict>
+</plist>
diff --git a/setup/apple/Contents/Resources/netradiant.icns b/setup/apple/Contents/Resources/netradiant.icns
new file mode 100644 (file)
index 0000000..339e718
Binary files /dev/null and b/setup/apple/Contents/Resources/netradiant.icns differ
diff --git a/setup/apple/Makefile b/setup/apple/Makefile
deleted file mode 100644 (file)
index cf85d97..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# Makefile for NetRadiant.app, requires http://macdylibbundler.sourceforge.net/
-
-INSTALL = ../../install
-TARGET = target
-RESOURCES = $(TARGET)/NetRadiant.app/Contents/Resources
-BINDIR = $(RESOURCES)/install
-CONFDIR = $(RESOURCES)/etc
-DATADIR = $(RESOURCES)/share
-LIBDIR = $(RESOURCES)/lib
-VERSION = 1.5.0
-DMG = $(TARGET)/NetRadiant-$(VERSION).dmg
-VOLUME_NAME = "NetRadiant $(VERSION)"
-
-# We must rewrite some Gtk configuration files, which vary from environment to
-# environment depending on where you've installed MacPorts. Fun!
-
-MACPORTS_PREFIX := $(shell which port | sed 's:/bin/port::')
-PREFIX_SED_EXPR = "s:$(MACPORTS_PREFIX):@executable_path/..:g"
-
-all: install bundle
-
--pre-install:
-       install -d $(TARGET)
-       cp -r NetRadiant.app $(TARGET)
-       find $(TARGET) -name .turd -delete
-       
--gtk-runtime-gdk-pixbuf-2.0:
-       cp -r $(MACPORTS_PREFIX)/lib/gdk-pixbuf-2.0 $(LIBDIR)
-       find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete
-       
-       gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \
-               $(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders
-
--gtk-runtime-pango:
-       cp -r $(MACPORTS_PREFIX)/lib/pango $(LIBDIR)
-       find $(LIBDIR)/pango -type f ! -name "*.so" -delete
-       
-       pango-querymodules | sed $(PREFIX_SED_EXPR) > \
-               $(CONFDIR)/pango/pango.modules
-       
--gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 -gtk-runtime-pango
-       cp -r $(MACPORTS_PREFIX)/lib/gtk-2.0 $(LIBDIR)
-       find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete   
-       
-       rm -rf $(LIBDIR)/gtk-2.0/{includes,modules}
-       rm -rf $(LIBDIR)/gtk-2.0/*/printbackends
-       
-       cp -r $(MACPORTS_PREFIX)/share/themes/Default $(RESOURCES)/share
-       
-       gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \
-               $(CONFDIR)/gtk-2.0/gtk.immodules
-
-install: -pre-install -gtk-runtime
-       cp -r $(INSTALL) $(RESOURCES)
-       #rm -rf `find $(INSTDIR)/installs -type d -name .svn`
-
-bundle:
-       
-       # The Radiant plugins (modules) are a little funky
-       # Some of them are actually linked against the build directory
-       
-       test -L install || ln -s $(INSTALL)
-       
-       dylibbundler -b \
-               -x $(BINDIR)/radiant \
-               -x $(BINDIR)/q2map \
-               -x $(BINDIR)/q3data \
-               -x $(BINDIR)/q3map2 \
-               -x $(BINDIR)/qdata3 \
-               `find $(BINDIR)/modules -name "*.dylib" | xargs -I {} echo -x {}` \
-               `find $(LIBDIR) -name "*.dylib" | xargs -I {} echo -x {}` \
-       -d $(LIBDIR) -of -p @executable_path/../lib
-       
-       rm -f install
-
-image:
-       find $(TARGET) -name .DS_Store -delete
-       ln -f -s /Applications $(TARGET)/Applications
-       hdiutil create -ov $(DMG) -srcfolder $(TARGET) -volname $(VOLUME_NAME)
-       rm $(TARGET)/Applications
-
-clean:
-       rm -rf $(TARGET)/*
diff --git a/setup/apple/NetRadiant.app/Contents/Info.plist b/setup/apple/NetRadiant.app/Contents/Info.plist
deleted file mode 100644 (file)
index 2b34323..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>CFBundleDisplayName</key>
-        <string>NetRadiant</string>
-        <key>CFBundleExecutable</key>
-        <string>netradiant</string>
-        <key>CFBundleIconFile</key>
-        <string>netradiant.icns</string>
-        <key>CFBundleIdentifier</key>
-        <string>org.xonotic.netradiant</string>
-        <key>CFBundleName</key>
-        <string>NetRadiant</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.5.0</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>1.5.0</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>10.7</string>
-</dict>
-</plist>
diff --git a/setup/apple/NetRadiant.app/Contents/MacOS/netradiant b/setup/apple/NetRadiant.app/Contents/MacOS/netradiant
deleted file mode 100755 (executable)
index 701a7fe..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-RADIANT_HOME=$(dirname "$0")
-RADIANT_HOME=${RADIANT_HOME/NetRadiant.app*/NetRadiant.app}
-
-echo
-echo "Starting NetRadiant in ${RADIANT_HOME}"
-echo
-
-set -x
-
-resources="${RADIANT_HOME}/Contents/Resources"
-
-export FONTCONFIG_PATH="${resources}/etc/fonts"
-export FC_DEBUG=1024
-
-export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib"
-export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib"
-
-export GDK_PATH="${resources}"
-export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders"
-
-export GOBJECT_PATH="${resources}"
-
-export GTK_DATA_PREFIX="${resources}"
-export GTK_EXE_PREFIX="${resources}"
-export GTK_PATH="${resources}"
-
-export PANGO_SYSCONFDIR="${resources}/etc"
-export PANGO_LIBDIR="${resources}/lib"
-
-cd "${resources}/install"
-./radiant &
-
-set +x
\ No newline at end of file
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf b/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
deleted file mode 100644 (file)
index 7183a4b..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!--
-  Adjusted FontConfig for GtkRadiant.app. Include only paths which Mac users
-  will more than likely have.
--->
-
-<!--
-  Font directory list
--->
-       <dir>/usr/X11/lib/X11/fonts</dir>
-       <dir>/Library/Fonts</dir>
-       <dir>/System/Library/Fonts</dir>
-       <dir prefix="xdg">fonts</dir>
-
-<!--
-  Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
-       <match target="pattern">
-               <test qual="any" name="family">
-                       <string>mono</string>
-               </test>
-               <edit name="family" mode="assign" binding="same">
-                       <string>monospace</string>
-               </edit>
-       </match>
-
-<!--
-  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
-       <match target="pattern">
-               <test qual="any" name="family">
-                       <string>sans serif</string>
-               </test>
-               <edit name="family" mode="assign" binding="same">
-                       <string>sans-serif</string>
-               </edit>
-       </match>
-
-<!--
-  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
-       <match target="pattern">
-               <test qual="any" name="family">
-                       <string>sans</string>
-               </test>
-               <edit name="family" mode="assign" binding="same">
-                       <string>sans-serif</string>
-               </edit>
-       </match>
-
-<!-- Font cache directory list -->
-       <cachedir prefix="xdg">fontconfig</cachedir>
-
-       <config>
-<!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-               <blank>
-                       <int>0x0020</int>       <!-- SPACE -->
-                       <int>0x00A0</int>       <!-- NO-BREAK SPACE -->
-                       <int>0x00AD</int>       <!-- SOFT HYPHEN -->
-                       <int>0x034F</int>       <!-- COMBINING GRAPHEME JOINER -->
-                       <int>0x0600</int>       <!-- ARABIC NUMBER SIGN -->
-                       <int>0x0601</int>       <!-- ARABIC SIGN SANAH -->
-                       <int>0x0602</int>       <!-- ARABIC FOOTNOTE MARKER -->
-                       <int>0x0603</int>       <!-- ARABIC SIGN SAFHA -->
-                       <int>0x06DD</int>       <!-- ARABIC END OF AYAH -->
-                       <int>0x070F</int>       <!-- SYRIAC ABBREVIATION MARK -->
-                       <int>0x115F</int>       <!-- HANGUL CHOSEONG FILLER -->
-                       <int>0x1160</int>       <!-- HANGUL JUNGSEONG FILLER -->
-                       <int>0x1680</int>       <!-- OGHAM SPACE MARK -->
-                       <int>0x17B4</int>       <!-- KHMER VOWEL INHERENT AQ -->
-                       <int>0x17B5</int>       <!-- KHMER VOWEL INHERENT AA -->
-                       <int>0x180E</int>       <!-- MONGOLIAN VOWEL SEPARATOR -->
-                       <int>0x2000</int>       <!-- EN QUAD -->
-                       <int>0x2001</int>       <!-- EM QUAD -->
-                       <int>0x2002</int>       <!-- EN SPACE -->
-                       <int>0x2003</int>       <!-- EM SPACE -->
-                       <int>0x2004</int>       <!-- THREE-PER-EM SPACE -->
-                       <int>0x2005</int>       <!-- FOUR-PER-EM SPACE -->
-                       <int>0x2006</int>       <!-- SIX-PER-EM SPACE -->
-                       <int>0x2007</int>       <!-- FIGURE SPACE -->
-                       <int>0x2008</int>       <!-- PUNCTUATION SPACE -->
-                       <int>0x2009</int>       <!-- THIN SPACE -->
-                       <int>0x200A</int>       <!-- HAIR SPACE -->
-                       <int>0x200B</int>       <!-- ZERO WIDTH SPACE -->
-                       <int>0x200C</int>       <!-- ZERO WIDTH NON-JOINER -->
-                       <int>0x200D</int>       <!-- ZERO WIDTH JOINER -->
-                       <int>0x200E</int>       <!-- LEFT-TO-RIGHT MARK -->
-                       <int>0x200F</int>       <!-- RIGHT-TO-LEFT MARK -->
-                       <int>0x2028</int>       <!-- LINE SEPARATOR -->
-                       <int>0x2029</int>       <!-- PARAGRAPH SEPARATOR -->
-                       <int>0x202A</int>       <!-- LEFT-TO-RIGHT EMBEDDING -->
-                       <int>0x202B</int>       <!-- RIGHT-TO-LEFT EMBEDDING -->
-                       <int>0x202C</int>       <!-- POP DIRECTIONAL FORMATTING -->
-                       <int>0x202D</int>       <!-- LEFT-TO-RIGHT OVERRIDE -->
-                       <int>0x202E</int>       <!-- RIGHT-TO-LEFT OVERRIDE -->
-                       <int>0x202F</int>       <!-- NARROW NO-BREAK SPACE -->
-                       <int>0x205F</int>       <!-- MEDIUM MATHEMATICAL SPACE -->
-                       <int>0x2060</int>       <!-- WORD JOINER -->
-                       <int>0x2061</int>       <!-- FUNCTION APPLICATION -->
-                       <int>0x2062</int>       <!-- INVISIBLE TIMES -->
-                       <int>0x2063</int>       <!-- INVISIBLE SEPARATOR -->
-                       <int>0x206A</int>       <!-- INHIBIT SYMMETRIC SWAPPING -->
-                       <int>0x206B</int>       <!-- ACTIVATE SYMMETRIC SWAPPING -->
-                       <int>0x206C</int>       <!-- INHIBIT ARABIC FORM SHAPING -->
-                       <int>0x206D</int>       <!-- ACTIVATE ARABIC FORM SHAPING -->
-                       <int>0x206E</int>       <!-- NATIONAL DIGIT SHAPES -->
-                       <int>0x206F</int>       <!-- NOMINAL DIGIT SHAPES -->
-                       <int>0x2800</int>       <!-- BRAILLE PATTERN BLANK -->
-                       <int>0x3000</int>       <!-- IDEOGRAPHIC SPACE -->
-                       <int>0x3164</int>       <!-- HANGUL FILLER -->
-                       <int>0xFEFF</int>       <!-- ZERO WIDTH NO-BREAK SPACE -->
-                       <int>0xFFA0</int>       <!-- HALFWIDTH HANGUL FILLER -->
-                       <int>0xFFF9</int>       <!-- INTERLINEAR ANNOTATION ANCHOR -->
-                       <int>0xFFFA</int>       <!-- INTERLINEAR ANNOTATION SEPARATOR -->
-                       <int>0xFFFB</int>       <!-- INTERLINEAR ANNOTATION TERMINATOR -->
-               </blank>
-<!--
-  Rescan configuration every 30 seconds when FcFontSetList is called
- -->
-               <rescan>
-                       <int>30</int>
-               </rescan>
-       </config>
-
-</fontconfig>
-
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc b/setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc b/setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc
deleted file mode 100644 (file)
index f56d343..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[Pango]
\ No newline at end of file
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/lib/.turd b/setup/apple/NetRadiant.app/Contents/Resources/lib/.turd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/netradiant.icns b/setup/apple/NetRadiant.app/Contents/Resources/netradiant.icns
deleted file mode 100644 (file)
index 339e718..0000000
Binary files a/setup/apple/NetRadiant.app/Contents/Resources/netradiant.icns and /dev/null differ
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/setup/apple/README.md b/setup/apple/README.md
deleted file mode 100644 (file)
index 069cf3d..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-NetRadiant for Apple OS X
-========================
-
-This directory provides packaging steps for NetRadiant for OS X. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory.
-
-Dependencies & Compilation
---------------------------
-
-Directions for OS X Yosemite 10.10 - your mileage may vary:
-
-- Install [MacPorts](http://macports.org).
-- Install [XQuartz](http://xquartz.macosforge.org/)
-
-- Install dependencies with MacPorts:
-
-```
-sudo port install dylibbundler pkgconfig gtkglext
-```
-
-- Get the NetRadiant code and compile:
-
-```
-git clone https://gitlab.com/xonotic/netradiant.git
-cd netradiant/
-make
-```
-
-- Run the build:
-
-(from the netradiant/ directory)
-```
-./install/radiant
-```
-
-XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: `/Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin`, then start radiant. 
-    
-Building NetRadiant.app
------------------------
-
-The `Makefile` in the 'setup/apple/' directory will produce a distributable .app bundle for NetRadiant using `dylibbundler`:
-
-```
-make
-make image
-```
-
-Getting help
-------------
-
-IRC: Quakenet #xonotic, or post something on the issue tracker..
diff --git a/setup/apple/netradiant b/setup/apple/netradiant
new file mode 100755 (executable)
index 0000000..9e27101
--- /dev/null
@@ -0,0 +1,38 @@
+#! /usr/bin/env bash
+
+set -o physical
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
+bundle_dir="$(cd "${script_dir}/../Prefix"; pwd)"
+
+echo "Starting NetRadiant in ${bundle_dir}"
+
+set -x
+
+cd "${bundle_dir}"
+
+export FC_DEBUG=1024
+
+# if bundled
+if [ -d "${bundle_dir}/share/icons/hicolor" ]
+then
+       export FONTCONFIG_PATH="${bundle_dir}/etc/fonts"
+
+       # export GDK_GL_LIBGL_PATH="${bundle_dir}/lib/libGL.1.dylib"
+       # export GDK_GL_LIBGLU_PATH="${bundle_dir}/lib/libGLU.1.dylib"
+
+       export GDK_PATH="${bundle_dir}"
+
+       export GDK_PIXBUF_MODULE_FILE="${bundle_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+       export GTK_IM_MODULE_FILE="${bundle_dir}/lib/gtk-2.0/2.10.0/immodules.cache"
+
+       export GOBJECT_PATH="${bundle_dir}"
+
+       export GTK_DATA_PREFIX="${bundle_dir}"
+       export GTK_EXE_PREFIX="${bundle_dir}"
+       export GTK_PATH="${bundle_dir}"
+fi
+
+./netradiant &