adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1781 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-05-15 23:03:47 +00:00
parent 22272e3806
commit 2151841889
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build.vars.in
+2
View File
@@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
BUILD_SYSTEM='@BUILD_SYSTEM@'
HOST_SYSTEM='@HOST_SYSTEM@'
COMPILE=gcc COMPILE=gcc
MKDEPEND='gcc -MM' MKDEPEND='gcc -MM'
MAKE='@MAKE@' MAKE='@MAKE@'
sc2/build/unix/build.config
+6 -5
View File
@@ -242,7 +242,8 @@ uqm_process_config() {
substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK" substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK"
# Make build.vars from build.vars.in, substituting variables. # Make build.vars from build.vars.in, substituting variables.
SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE ECHON DEBUG SED SOUNDMODULE \ SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM CFLAGS LDFLAGS MAKE \
ECHON DEBUG SED SOUNDMODULE \
HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \ HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \ INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
REZ WINDRES" REZ WINDRES"
@@ -314,7 +315,7 @@ uqm_post_install() {
} }
uqm_install_osx() { uqm_install_osx() {
local VERSION HEADERS HEADER FRAMEWORK local VERSION HEADERS HEADER HEADER_FILE FRAMEWORK
VERSION=`head -1 content/version` VERSION=`head -1 content/version`
@@ -340,10 +341,10 @@ uqm_install_osx() {
HEADERS="$HEADERS OpenAL/al.h" HEADERS="$HEADERS OpenAL/al.h"
fi fi
for HEADER in $HEADERS; do for HEADER in $HEADERS; do
HEADER=`basename $HEADER` HEADER_FILE=`basename $HEADER`
eval FRAMEWORK=`echo '' | \ eval FRAMEWORK=`echo '' | \
$COMPILE -E -D__MACOSX__ -include $HEADER - | \ $COMPILE -E -D__MACOSX__ -include $HEADER - | \
awk '(/'$HEADER'/ && $2 == 1) { print $3; exit }' | \ awk '(/'$HEADER_FILE'/ && $2 == 1) { print $3; exit }' | \
$SED 's/.Headers.*$/"/'` $SED 's/.Headers.*$/"/'`
cp -r "$FRAMEWORK" "$INSTROOT/Frameworks" cp -r "$FRAMEWORK" "$INSTROOT/Frameworks"
done done
@@ -351,7 +352,7 @@ uqm_install_osx() {
# Install game content (it should probably make a zipfile) # Install game content (it should probably make a zipfile)
cp content/starcon.key content/version "$INSTROOT/Resources/content" cp content/starcon.key content/version "$INSTROOT/Resources/content"
(cd content && \ (cd content && \
find .\( -name CVS -o -name packages \) -prune -o \ find . \( -name CVS -o -name packages \) -prune -o \
\! \( -type d -o -name packages -o -name CVS -o \ \! \( -type d -o -name packages -o -name CVS -o \
-name starcon.key -o -name version -o -name \*.ogg \) \ -name starcon.key -o -name version -o -name \*.ogg \) \
-print | $SED 's/^..//' | zip -@ uqm-${VERSION}-prv-content.uqm) -print | $SED 's/^..//' | zip -@ uqm-${VERSION}-prv-content.uqm)