Fix OSX-related typos in Makefile and osxbuild.sh.

git-svn-id: https://svn.eduke32.com/eduke32@2425 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-08 06:06:00 +00:00
parent dca9d1357c
commit 93be45cb1a
2 changed files with 3 additions and 3 deletions

View file

@ -199,7 +199,7 @@ ifeq ($(PLATFORM),DARWIN)
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \ -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \
-Wl,-framework,CoreMidi -Wl,-framework,AudioUnit \ -Wl,-framework,CoreMidi -Wl,-framework,AudioUnit \
-Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \ -Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \
-Wl,-framework,QuickTime -lm -Wl,-framework,QuickTime -lm \
-Wl,-rpath -Wl,"@loader_path/../Frameworks" -Wl,-rpath -Wl,"@loader_path/../Frameworks"
# We have SDLMain.m from the OSX SDL package in the Apple/ subdir: # We have SDLMain.m from the OSX SDL package in the Apple/ subdir:
EDITOROBJS+=$(OBJ)/SDLMain.$o EDITOROBJS+=$(OBJ)/SDLMain.$o

View file

@ -20,12 +20,12 @@ fi
rev=`svn info | grep Revision | awk '{ print $2 }'` rev=`svn info | grep Revision | awk '{ print $2 }'`
vc=svn vc=svn
if [ -z "$ref" ]; then if [ -z "$rev" ]; then
vc=git vc=git
rev=`git svn info | grep 'Revision' | awk '{ print $2 }'` rev=`git svn info | grep 'Revision' | awk '{ print $2 }'`
fi fi
if [ -n "$ref" ]; then if [ -n "$rev" ]; then
# throw the svn revision into a header. this is ugly. # throw the svn revision into a header. this is ugly.
echo "const char *s_buildRev = \"r$rev\";" > source/rev.h echo "const char *s_buildRev = \"r$rev\";" > source/rev.h
else else