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

Update the scripts for cross-building on Cygwin to Mingw with gcc 4 (-mno-cygwin is now gone)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3690 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-09-07 06:17:23 +00:00
parent 6f6c5c0788
commit bb33e30b79
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/unix/config_proginfo_build
+31
View File
@@ -142,6 +142,31 @@ case "$HOST_SYSTEM" in
BUILDTOOL_LINK_COMMAND="\$PROG_gcce_FILE $EXTRA_GCCE_FLAGS_LINK" BUILDTOOL_LINK_COMMAND="\$PROG_gcce_FILE $EXTRA_GCCE_FLAGS_LINK"
BUILDTOOL_LINK_DEPEND='gcce' BUILDTOOL_LINK_DEPEND='gcce'
;; ;;
CYGWIN*)
EXTRA_CYGWIN_FLAGS_COMPILE=''
EXTRA_CYGWIN_FLAGS_LINK=''
BUILDTOOL_PREPROC_C_COMMAND="\$PROG_mingw_gcc_FILE -E $EXTRA_CYGWIN_FLAGS_COMPILE"
BUILDTOOL_PREPROC_C_DEPEND='mingw_gcc'
BUILDTOOL_MKDEP_C_COMMAND="\$PROG_mingw_gcc_FILE -MM $EXTRA_CYGWIN_FLAGS_COMPILE"
BUILDTOOL_MKDEP_C_DEPEND='mingw_gcc'
BUILDTOOL_COMPILE_C_COMMAND="\$PROG_mingw_gcc_FILE -c $EXTRA_CYGWIN_FLAGS_COMPILE"
BUILDTOOL_COMPILE_C_DEPEND='mingw_gcc'
BUILDTOOL_PREPROC_OBJC_COMMAND="\$PROG_mingw_gcc_FILE -E"
BUILDTOOL_PREPROC_OBJC_DEPEND='mingw_gcc'
BUILDTOOL_MKDEP_OBJC_COMMAND="\$PROG_mingw_gcc_FILE -MM"
BUILDTOOL_MKDEP_OBJC_DEPEND='mingw_gcc'
BUILDTOOL_COMPILE_OBJC_COMMAND="\$PROG_mingw_gcc_FILE -c"
BUILDTOOL_COMPILE_OBJC_DEPEND='mingw_gcc'
BUILDTOOL_LINK_COMMAND="\$PROG_mingw_gcc_FILE $EXTRA_CYGWIN_FLAGS_LINK"
BUILDTOOL_LINK_DEPEND='mingw_gcc'
;;
*) *)
useGccBuildTools useGccBuildTools
;; ;;
@@ -303,6 +328,12 @@ PROG_gcce_ACTION=""
PROG_gcce_VERSION='$(arm-none-symbianelf-gcc --version)' PROG_gcce_VERSION='$(arm-none-symbianelf-gcc --version)'
### mingw-gcc ###
PROG_mingw_gcc_NAME="GNU C MinGW Cross-compiler"
PROG_mingw_gcc_FILE="i686-pc-mingw32-gcc"
PROG_mingw_gcc_ACTION=""
PROG_mingw_gcc_VERSION='$(i686-pc-mingw32-gcc --version)'
############################################################################## ##############################################################################
# Describe the libaries (possibly) used: # # Describe the libaries (possibly) used: #
sc2/build/unix/config_proginfo_host
-10
View File
@@ -24,17 +24,7 @@
# CFLAGS # CFLAGS
case "$HOST_SYSTEM" in
CYGWIN*)
# HACK: sdl-config on Cygwin supplies -mno-cygwin which means that
# dependencies detected without that flag may not be available at
# the actual build.
SYSTEM_HOST_CFLAGS="-mno-cygwin"
;;
*)
SYSTEM_HOST_CFLAGS="" SYSTEM_HOST_CFLAGS=""
;;
esac
# LDFLAGS # LDFLAGS
SYSTEM_HOST_LDFLAGS="" SYSTEM_HOST_LDFLAGS=""