some minor fixes for the osxnetradiant changes
This commit is contained in:
parent
7dd945e36a
commit
a3cfcb0acd
2
Makefile
2
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
20
osx-Makefile.conf
Normal file
20
osx-Makefile.conf
Normal file
|
|
@ -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
|
||||
|
|
@ -1 +0,0 @@
|
|||
dummy for correct execute rights
|
||||
Loading…
Reference in New Issue
Block a user