Unix build improvement (build tool detection).

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2535 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-11-25 01:19:22 +00:00
parent fc2941b60d
commit a5b27582ab
8 changed files with 221 additions and 47 deletions
+10 -10
View File
@@ -9,17 +9,15 @@
uqm_requirements()
{
# Some requirements:
have_program gcc || exit 1
COMPILE="$PROG_gcc_FILE"
have_build_tools_language C || exit 1
have_build_tool LINK || exit 1
case "$HOST_SYSTEM" in
MINGW32*)
have_program windres
WINDRES="$PROG_windres_FILE"
have_build_tool WINDRES || exit 1
;;
Darwin)
have_program Rez || exit 1
REZ="$PROG_Rez_FILE"
have_build_tools_language OBJC || exit 1
have_build_tool REZ || exit 1
;;
esac
@@ -343,7 +341,9 @@ uqm_process_config() {
substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK"
# Make build.vars from build.vars.in, substituting variables.
SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM COMPILE CFLAGS LDFLAGS \
SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM CFLAGS LDFLAGS LINK \
PREPROC_C MKDEP_C COMPILE_C \
PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC \
MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
SOUNDMODULE USE_INTERNAL_MIKMOD \
HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
@@ -389,7 +389,7 @@ uqm_post_build() {
# the resource fork, in fact)
case "$HOST_SYSTEM" in
Darwin)
${REZ} ${RFORK} -o ${TARGET_FILE}
$REZ "$RFORK" -o "$TARGET_FILE"
;;
esac
}
@@ -449,7 +449,7 @@ uqm_install_osx() {
for HEADER in $HEADERS; do
HEADER_FILE=`basename $HEADER`
eval FRAMEWORK=`echo '' | \
$COMPILE -E -D__MACOSX__ -include $HEADER - | \
$PREPROC_C -D__MACOSX__ -include $HEADER - | \
awk '(/'$HEADER_FILE'/ && $2 == 1) { print $3; exit }' | \
$SED 's/.Headers.*$/"/'`
cp -r "$FRAMEWORK" "$INSTROOT/Frameworks"