Removed (broken) cross-compilation support from makefiles.

If you want to cross-compile you better use configure.

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

diff --git a/src/makeg95.env b/src/makeg95.env
index a84cdd4ab3cfedc555ef94b46e011580196475f8..4ecb310617f8b824fa27c7645d4410b8f19e200b 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -46,9 +46,6 @@ RM=rm -f
 # You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site.
 COPY=cp
 
-# Cross compiling? Provide the target prefix (eg., i386-mingw32-)
-# CROSS=i386-mingw32-
-
 ########################## Compiler ##################################
 
 # C++ compiler
@@ -66,19 +63,19 @@ endif
 
 ifeq ($(MINGW32),1)
   ifneq "$(_GCC295)$(_GCC3)" ""
-    CC = $(CROSS)gcc --pipe $(if $(_GCC3), , -fvtable-thunks)
+    CC = gcc --pipe $(if $(_GCC3), , -fvtable-thunks)
   else
-    CC = $(CROSS)gcc
+    CC = gcc
   endif
 else
-  CC = $(CROSS)gcc
+  CC = gcc
 endif
 
 # C compiler for pure C programs
 CCC = $(CC)
 
 # Compiler used for LEX generated C
-CCLEX=$(CROSS)gcc
+CCLEX=gcc
 
 # This shouldn't be needed as make is supposed to define this
 # variable itself. Uncomment it if your make complains.
@@ -94,7 +91,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.
-RESCOMP=$(CROSS)windres
+RESCOMP=windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
@@ -109,8 +106,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.
-AS = $(CROSS)as
-DLLTOOL = $(CROSS)dlltool
+AS = as
+DLLTOOL = dlltool
 
 ########################## Compiler flags #############################
 
@@ -175,9 +172,9 @@ endif
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
-AR = $(CROSS)ar
+AR = ar
 AROPTIONS = ruv
-RANLIB = $(CROSS)ranlib
+RANLIB = ranlib
 
 # Extra compiler libraries
 COMPLIBS=