quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some minor fixes for the osxnetradiant changes

Browse Source
This commit is contained in:
Rudolf Polzer 2010-03-28 19:17:58 +02:00
parent 7dd945e36a
commit a3cfcb0acd
5 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -193,7 +193,7 @@ ifeq ($(OS),Darwin)
DLL = dylib DLL = dylib
MWINDOWS = MWINDOWS =
MACVERSION ?= 16 MACVERSION ?= 16
CPPFLAGS += -DMACVERSION="$(MACVERSION)" CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
# workaround for weird prints # workaround for weird prints
ECHO_NOLF = /bin/echo -n ECHO_NOLF = /bin/echo -n

21
Makefile.conf
View File

@ -1,20 +1 @@
# Makefile.conf template # empty 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

6
install-dylibs.sh
View File

@ -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/gtk-2.0/gdk-pixbuf.loaders "$INSTALLDIR"
cp -L "$MACLIBDIR"/../etc/pango/pangorc "$INSTALLDIR" cp -L "$MACLIBDIR"/../etc/pango/pangorc "$INSTALLDIR"
$CAT > $INSTALLDIR/../netradiant.sh <<EOF $CAT > "$INSTALLDIR/../netradiant.sh" <<EOF
#!/bin/sh #!/bin/sh
MY_DIRECTORY="\${0%/*}" # cut off the script name MY_DIRECTORY="\${0%/*}" # cut off the script name
@ -65,5 +65,7 @@ if [ -x /usr/bin/open-x11 ]; then
else else
env LC_ALL="en_US.UTF-8" ./radiant.$EXE "$@" & env LC_ALL="en_US.UTF-8" ./radiant.$EXE "$@" &
fi fi
EOF EOF
chmod 755 "$INSTALLDIR/../netradiant.sh"

20
osx-Makefile.conf Normal file
View 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
setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh
View File

@ -1 +0,0 @@
dummy for correct execute rights