Separate config files for MinGW/Cygwin.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1921 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-10-25 10:52:10 +00:00
parent 6effc2b53e
commit 4d95b7b771
7 changed files with 96 additions and 11 deletions
+3 -3
View File
@@ -38,9 +38,9 @@ library dirs in LDFLAGS.
Run configure:
./build.sh uqm config
This will produce the file 'build.vars' and 'config_unix.h'. If there
are any problems during the build, you can usually easilly solve them
by editing these files manually.
This will produce the file 'build.vars' and 'config_unix.h' (or config_win.h
on MinGW or Cygwin). If there are any problems during the build, you can
usually easilly solve them by editing these files manually.
Start the compilation:
./build.sh uqm
+20 -2
View File
@@ -236,9 +236,16 @@ uqm_process_config() {
CFLAGS="$CFLAGS -I \"$BUILD_WORK\""
# Export the HAVE_ symbols to config_unix.h, using config_unix.h.in
# as template.
# as template (or config_win.h/config_win.h.in).
SUBSTITUTE_VARS="$HAVE_SYMBOLS CONTENTDIR"
SUBSTITUTE_FILES="config_unix.h"
case "$HOST_SYSTEM" in
MINGW32*|CYGWIN*)
SUBSTITUTE_FILES="config_win.h"
;;
*)
SUBSTITUTE_FILES="config_unix.h"
;;
esac
substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK"
# Make build.vars from build.vars.in, substituting variables.
@@ -379,4 +386,15 @@ uqm_install_osx() {
cp $uqm_NAME "$INSTROOT/MacOS/The Ur-Quan Masters"
}
uqm_clean() {
case "$HOST_SYSTEM" in
MINGW32*|CYGWIN*)
rm -f "$BUILD_WORK/config_win.h"
;;
*)
rm -f "$BUILD_WORK/config_unix.h"
;;
esac
}
+2 -1
View File
@@ -130,7 +130,8 @@ build_clean() {
eval DEPEND_FILE="\$BUILD_WORK/\${${BUILD_PROJECT}_OBJS}${DEPEND_NAME}"
rm -f "$DEPEND_FILE" "$BUILD_WORK/build.vars" \
"$BUILD_WORK/config.state" "$BUILD_WORK/config_unix.h"
"$BUILD_WORK/config.state"
eval "${TARGET}_clean"
}
build_cleanall() {