Minor tweaks for cross-compiling

Still a long way from working, of course.

The configure script now runs to finish on Linux with --host=mingw32.

It is no longer an error if Windows SDK or DirectX SDK are not found
by the logic in the configure script. It might well be that the user
has included relevant -I and -L flags in CC or CXX that makes the
compilations work anyway, or something. We should not try to be too
clever and try to predict how the compiler or linker work in the
configure script.

We now define the FOO_FOR_BUILD environment variables in set_soenv.in
even when not cross-compiling (identically as the plain FOO ones in
that case, obviously). This should make some makefiles and stuff that
build tools to run on the build host a bit simpler.

1 files changed, 10 insertions, 35 deletions

diff --git a/bootstrap.1 b/bootstrap.1
index 7a524d3c089d..fa9cc06aa0aa 100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -1,7 +1,7 @@
 
 # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
 # Use spawn instead of fork when building dmake on cygwin. 
-if test "$GUI" = "WNT"; then
+if test "$GUI_FOR_BUILD" = "WNT"; then
     EXEEXT=".exe"
     DMAKE_CONF="--enable-spawn"
 else
@@ -17,27 +17,14 @@ if test "$BUILD_DMAKE" != "NO"; then
     if test ! -x "$SRC_ROOT/dmake/dmake$EXEEXT"; then
         cd "$SRC_ROOT/dmake" || exit
 
-	# If cross-compiling then don't use the cross compilers to build dmake.
-        if test "$CROSS_COMPILING" = "YES"; then
-            if test "$GUI_FOR_BUILD" = "WNT"; then
-                # Let the Cygwin gcc be found
-                CC=""
-                CXX=""
-            else
-                CC="$CC_FOR_BUILD"
-                CXX="$CXX_FOR_BUILD"
-            fi
-            export CC
-            export CXX
-        fi
-
-        # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
-        # but we need a cygwin/gcc build dmake to understand the posix paths
-        if test "$GUI" = "WNT"; then
-            CC=""
-            CXX=""
-            export CC
-            export CXX
+        # If cross-compiling then don't use the cross compilers to build dmake.
+        if test "$GUI_FOR_BUILD" = "WNT"; then
+            # Let the Cygwin gcc be found
+            export CC=""
+            export CXX=""
+        elif test "$CROSS_COMPILING" = "YES"; then
+            export CC="$CC_FOR_BUILD"
+            export CXX="$CXX_FOR_BUILD"
         fi
 
         # For normal unixy systems
@@ -55,7 +42,7 @@ if test "$BUILD_DMAKE" != "NO"; then
 
         cd ..
     else
-	echo "dmake/dmake already built"
+        echo "dmake/dmake already built"
     fi
 fi
 
@@ -66,18 +53,6 @@ if test "$BUILD_DMAKE" != "NO"; then
     echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
 fi
 
-if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then
-  echo ""
-  echo "Calling $GNUMAKE in guw"
-  cd "$SRC_ROOT/guw" || exit
-  $GNUMAKE || exit
-  echo ""
-  echo "guw has been successfully made"
-  cp -f "$SRC_ROOT/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
-  echo ""
-  echo "guw copied to $SOLARENV/$OUTPATH/bin/guw$EXEEXT"
-fi
-
 #make sure build.pl is executable 
 
 chmod +x "$SRC_ROOT/solenv/bin/build.pl"