[Sc2-cvs] SF.net SVN: sc2:[3690] trunk/sc2/build/unix

[<av...@us...>]

Revision: 3690
          http://sc2.svn.sourceforge.net/sc2/?rev=3690&view=rev
Author:   avolkov
Date:     2011-09-07 06:17:23 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Update the scripts for cross-building on Cygwin to Mingw with gcc 4 (-mno-cygwin is now gone)

Modified Paths:
--------------
    trunk/sc2/build/unix/config_proginfo_build
    trunk/sc2/build/unix/config_proginfo_host

Modified: trunk/sc2/build/unix/config_proginfo_build
===================================================================
--- trunk/sc2/build/unix/config_proginfo_build	2011-09-07 01:01:12 UTC (rev 3689)
+++ trunk/sc2/build/unix/config_proginfo_build	2011-09-07 06:17:23 UTC (rev 3690)
@@ -142,6 +142,31 @@
 		BUILDTOOL_LINK_COMMAND="\$PROG_gcce_FILE $EXTRA_GCCE_FLAGS_LINK"
 		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
 		;;
@@ -303,7 +328,13 @@
 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:                                     #
 ##############################################################################

Modified: trunk/sc2/build/unix/config_proginfo_host
===================================================================
--- trunk/sc2/build/unix/config_proginfo_host	2011-09-07 01:01:12 UTC (rev 3689)
+++ trunk/sc2/build/unix/config_proginfo_host	2011-09-07 06:17:23 UTC (rev 3690)
@@ -24,17 +24,7 @@
 
 
 # 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=""
-		;;
-esac
+SYSTEM_HOST_CFLAGS=""
 
 # LDFLAGS
 SYSTEM_HOST_LDFLAGS=""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.