Applied cross-compile patch from Stephen Crowley

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makeg95.env b/src/makeg95.env
index 9ce31061f7aa84ce1678df47d159fee7b02b83b6..18ae75e08e17222743a4ae19bcd3c47f03450188 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -14,6 +14,8 @@
 # If using Mingw32 or Cygwin 1.0 or later, set this to 1.
 MINGW32=1
 
 # If using Mingw32 or Cygwin 1.0 or later, set this to 1.
 MINGW32=1
 

+CROSS=i386-mingw32-
+

 # Set to the version you have
 #MINGW32VERSION=2.95
 MINGW32VERSION=3.0
 # Set to the version you have
 #MINGW32VERSION=2.95
 MINGW32VERSION=3.0


@@ -22,7 +24,7 @@ MINGW32VERSION=3.0
 # use forward slashes, we need to set this when
 # invoking the makefile from DOS, or the wrong separators
 # will be assumed.
 # use forward slashes, we need to set this when
 # invoking the makefile from DOS, or the wrong separators
 # will be assumed.

-#OSTYPE=msys
+OSTYPE=msys

 
 # If building DLL, the version
 WXVERSION=250
 
 # If building DLL, the version
 WXVERSION=250


@@ -32,7 +34,7 @@ ifndef UNICODE
 endif
 
 ifndef FINAL
 endif
 
 ifndef FINAL

-  FINAL=0
+  FINAL=1

 endif
 
 ifndef wxUSE_GUI
 endif
 
 ifndef wxUSE_GUI


@@ -71,22 +73,22 @@ endif
 ifeq ($(MINGW32),1)
   ifneq "$(_GCC295)$(_GCC3)" ""
     ifeq ($(_GCC3),1)
 ifeq ($(MINGW32),1)
   ifneq "$(_GCC295)$(_GCC3)" ""
     ifeq ($(_GCC3),1)

-      CC = gcc --pipe
+      CC = $(CROSS)gcc --pipe

     else
     else

-      CC = gcc --pipe -fvtable-thunks
+      CC = $(CROSS)gcc --pipe -fvtable-thunks

     endif
   else
     endif
   else

-    CC = gcc
+    CC = $(CROSS)gcc

   endif
 else
   endif
 else

-  CC = gcc
+  CC = $(CROSS)gcc

 endif
 
 # C compiler for pure C programs
 endif
 
 # C compiler for pure C programs

-CCC = $(CC)
+CCC = $(CROSS)gcc

 
 # Compiler used for LEX generated C
 
 # Compiler used for LEX generated C

-CCLEX=gcc
+CCLEX= $(CROSS)gcc

 
 # This shouldn't be needed as make is supposed to define this
 # variable itself. Uncomment it if your make complains.
 
 # This shouldn't be needed as make is supposed to define this
 # variable itself. Uncomment it if your make complains.


@@ -102,7 +104,7 @@ YACC=byacc
 # Settings for Cyginw/Mingw32
 # Some versions of windres cannot cope with the --preprocessor
 # option. Uncomment the RCPREPROCESSOR line below if yours can.
 # Settings for Cyginw/Mingw32
 # Some versions of windres cannot cope with the --preprocessor
 # option. Uncomment the RCPREPROCESSOR line below if yours can.

-RESCOMP=windres
+RESCOMP=$(CROSS)windres

 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir


@@ -117,8 +119,8 @@ RCDEFSWITCH=--define
 RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 # Needed to build a DLL if your linker does not support --shared option.
 RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 # Needed to build a DLL if your linker does not support --shared option.

-AS = as
-DLLTOOL = dlltool
+AS = $(CROSS)as
+DLLTOOL = $(CROSS)dlltool

 
 ########################## Compiler flags #############################
 
 
 ########################## Compiler flags #############################
 


@@ -128,7 +130,7 @@ DLLTOOL = dlltool
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Add "-mthreads" if you want to have threads under mingw32
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Add "-mthreads" if you want to have threads under mingw32

-COMMON_THREADFLAGS =
+COMMON_THREADFLAGS = -mthreads

 
 # Debugging information
 ifeq ($(FINAL),0)
 
 # Debugging information
 ifeq ($(FINAL),0)


@@ -186,9 +188,9 @@ endif
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).

-AR = ar
+AR = $(CROSS)ar

 AROPTIONS = ruv
 AROPTIONS = ruv

-RANLIB = ranlib
+RANLIB = $(CROSS)ranlib

 
 # Extra compiler libraries
 COMPLIBS=
 
 # Extra compiler libraries
 COMPLIBS=