From 93be45cb1a27f109ca0d85b560f09d9feae41ff3 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 8 Mar 2012 06:06:00 +0000 Subject: [PATCH] Fix OSX-related typos in Makefile and osxbuild.sh. git-svn-id: https://svn.eduke32.com/eduke32@2425 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile | 2 +- polymer/eduke32/osxbuild.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index bf116c52c..21472fe83 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -199,7 +199,7 @@ ifeq ($(PLATFORM),DARWIN) -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \ -Wl,-framework,CoreMidi -Wl,-framework,AudioUnit \ -Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \ - -Wl,-framework,QuickTime -lm + -Wl,-framework,QuickTime -lm \ -Wl,-rpath -Wl,"@loader_path/../Frameworks" # We have SDLMain.m from the OSX SDL package in the Apple/ subdir: EDITOROBJS+=$(OBJ)/SDLMain.$o diff --git a/polymer/eduke32/osxbuild.sh b/polymer/eduke32/osxbuild.sh index 9670487e0..d548ae03b 100755 --- a/polymer/eduke32/osxbuild.sh +++ b/polymer/eduke32/osxbuild.sh @@ -20,12 +20,12 @@ fi rev=`svn info | grep Revision | awk '{ print $2 }'` vc=svn -if [ -z "$ref" ]; then +if [ -z "$rev" ]; then vc=git rev=`git svn info | grep 'Revision' | awk '{ print $2 }'` fi -if [ -n "$ref" ]; then +if [ -n "$rev" ]; then # throw the svn revision into a header. this is ugly. echo "const char *s_buildRev = \"r$rev\";" > source/rev.h else