Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed (broken) cross-compilation support from makefiles.

Browse Source 
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
This commit is contained in:
Mattia Barbon
2002-08-27 20:40:33 +00:00
parent 3de0866e8c
commit 741258ea5a
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/makeg95.env
View File

@@ -46,9 +46,6 @@ RM=rm -f
# You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site. # You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site.
COPY=cp COPY=cp
# Cross compiling? Provide the target prefix (eg., i386-mingw32-)
# CROSS=i386-mingw32-
########################## Compiler ################################## ########################## Compiler ##################################
# C++ compiler # C++ compiler
@@ -66,19 +63,19 @@ endif
ifeq ($(MINGW32),1) ifeq ($(MINGW32),1)
ifneq "$(_GCC295)$(_GCC3)" "" ifneq "$(_GCC295)$(_GCC3)" ""
CC = $(CROSS)gcc --pipe $(if $(_GCC3), , -fvtable-thunks) CC = gcc --pipe $(if $(_GCC3), , -fvtable-thunks)
else else
CC = $(CROSS)gcc CC = gcc
endif endif
else else
CC = $(CROSS)gcc CC = gcc
endif endif
# C compiler for pure C programs # C compiler for pure C programs
CCC = $(CC) CCC = $(CC)
# Compiler used for LEX generated C # Compiler used for LEX generated C
CCLEX=$(CROSS)gcc CCLEX=gcc
# This shouldn't be needed as make is supposed to define this # This shouldn't be needed as make is supposed to define this
# variable itself. Uncomment it if your make complains. # variable itself. Uncomment it if your make complains.
@@ -94,7 +91,7 @@ YACC=byacc
# Settings for Cyginw/Mingw32 # Settings for Cyginw/Mingw32
# Some versions of windres cannot cope with the --preprocessor # Some versions of windres cannot cope with the --preprocessor
# option. Uncomment the RCPREPROCESSOR line below if yours can. # option. Uncomment the RCPREPROCESSOR line below if yours can.
RESCOMP=$(CROSS)windres RESCOMP=windres
RCINPUTSWITCH=-i RCINPUTSWITCH=-i
RCOUTPUTSWITCH=-o RCOUTPUTSWITCH=-o
RCINCSWITCH=--include-dir RCINCSWITCH=--include-dir
@@ -109,8 +106,8 @@ RCDEFSWITCH=--define
RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__ 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. # Needed to build a DLL if your linker does not support --shared option.
AS = $(CROSS)as AS = as
DLLTOOL = $(CROSS)dlltool DLLTOOL = dlltool
########################## Compiler flags ############################# ########################## Compiler flags #############################
@@ -175,9 +172,9 @@ endif
# Options for ar archiver # Options for ar archiver
# AROPTIONS = crs # For IRIX and Solaris (both SYSVR4). # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
AR = $(CROSS)ar AR = ar
AROPTIONS = ruv AROPTIONS = ruv
RANLIB = $(CROSS)ranlib RANLIB = ranlib
# Extra compiler libraries # Extra compiler libraries
COMPLIBS= COMPLIBS=