some minor fixes for the osxnetradiant changes

diff --git a/Makefile b/Makefile
index 14cfac916f759b20637b3e7942a63391103e4b6e..17e2b6634558cfe0b7f49dfa1a739bcfba303913 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ ifeq ($(OS),Darwin)
        DLL = dylib
        MWINDOWS =
        MACVERSION ?= 16
-       CPPFLAGS += -DMACVERSION="$(MACVERSION)"
+       CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
        # workaround for weird prints
        ECHO_NOLF = /bin/echo -n
 

diff --git a/Makefile.conf b/Makefile.conf
index ef1d5bfc803ca0a23f347ab41a59ee6a670a0c09..0f5fa9241b98b749345e22647d8a748b67b9403e 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -1,20 +1 @@
-# Makefile.conf template
-
-## OS X:
-BUILD=debug
-RADIANT_ABOUTMSG=OSX NetRadiant Custom build
-EXE=ub
-### Snow Leopard 16, Leopard 15, Tiger 14, Panther 13
-MACVERSION=16
-#
-## MacPorts:
-CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/ 
-LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
-MACLIBDIR=/opt/local/lib
-
-## Fink
-## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6) 
-# LDFLAGS=-arch i386
-# CFLAGS=-arch i386
-# TARGET_ARCH=-arch i386
-# MACLIBDIR=/sw/lib
+# empty Makefile.conf template

diff --git a/install-dylibs.sh b/install-dylibs.sh
index fd70339a2050f2823f6a7d3747db60289d9d3367..798a7d142adcfe1e00af7757efe3fdff85d391f8 100644 (file)
--- a/install-dylibs.sh
+++ b/install-dylibs.sh
@@ -47,7 +47,7 @@ cp -L "$MACLIBDIR"/../etc/fonts/fonts.dtd "$INSTALLDIR"
 cp -L "$MACLIBDIR"/../etc/gtk-2.0/gdk-pixbuf.loaders "$INSTALLDIR"
 cp -L "$MACLIBDIR"/../etc/pango/pangorc "$INSTALLDIR"
 
-$CAT > $INSTALLDIR/../netradiant.sh <<EOF
+$CAT > "$INSTALLDIR/../netradiant.sh" <<EOF
 #!/bin/sh
 
 MY_DIRECTORY="\${0%/*}" # cut off the script name
@@ -65,5 +65,7 @@ if [ -x /usr/bin/open-x11 ]; then
 else
        env LC_ALL="en_US.UTF-8" ./radiant.$EXE "$@" &
 fi
-
 EOF
+
+chmod 755 "$INSTALLDIR/../netradiant.sh"
+

diff --git a/osx-Makefile.conf b/osx-Makefile.conf
new file mode 100644 (file)
index 0000000..ef1d5bf
--- /dev/null
+++ b/osx-Makefile.conf
@@ -0,0 +1,20 @@
+# Makefile.conf template
+
+## OS X:
+BUILD=debug
+RADIANT_ABOUTMSG=OSX NetRadiant Custom build
+EXE=ub
+### Snow Leopard 16, Leopard 15, Tiger 14, Panther 13
+MACVERSION=16
+#
+## MacPorts:
+CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/ 
+LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
+MACLIBDIR=/opt/local/lib
+
+## Fink
+## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6) 
+# LDFLAGS=-arch i386
+# CFLAGS=-arch i386
+# TARGET_ARCH=-arch i386
+# MACLIBDIR=/sw/lib

diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh b/setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh
deleted file mode 100755 (executable)
index f498252..0000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh
+++ /dev/null
@@ -1 +0,0 @@
-dummy for correct execute rights
\ No newline at end of file