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

Reverted cross-compile patch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-24 09:51:45 +00:00
parent d0604192a5
commit 8a653baab6
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/makeg95.env
View File

@@ -14,8 +14,6 @@
# If using Mingw32 or Cygwin 1.0 or later, set this to 1. # If using Mingw32 or Cygwin 1.0 or later, set this to 1.
MINGW32=1 MINGW32=1
CROSS=i386-mingw32-
# Set to the version you have # Set to the version you have
#MINGW32VERSION=2.95 #MINGW32VERSION=2.95
MINGW32VERSION=3.0 MINGW32VERSION=3.0
@@ -24,7 +22,7 @@ MINGW32VERSION=3.0
# use forward slashes, we need to set this when # use forward slashes, we need to set this when
# invoking the makefile from DOS, or the wrong separators # invoking the makefile from DOS, or the wrong separators
# will be assumed. # will be assumed.
OSTYPE=msys #OSTYPE=msys
# If building DLL, the version # If building DLL, the version
WXVERSION=250 WXVERSION=250
@@ -34,7 +32,7 @@ ifndef UNICODE
endif endif
ifndef FINAL ifndef FINAL
FINAL=1 FINAL=0
endif endif
ifndef wxUSE_GUI ifndef wxUSE_GUI
@@ -73,22 +71,22 @@ endif
ifeq ($(MINGW32),1) ifeq ($(MINGW32),1)
ifneq "$(_GCC295)$(_GCC3)" "" ifneq "$(_GCC295)$(_GCC3)" ""
ifeq ($(_GCC3),1) ifeq ($(_GCC3),1)
CC = $(CROSS)gcc --pipe CC = gcc --pipe
else else
CC = $(CROSS)gcc --pipe -fvtable-thunks CC = gcc --pipe -fvtable-thunks
endif endif
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 = $(CROSS)gcc 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.
@@ -104,7 +102,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
@@ -119,8 +117,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 #############################
@@ -130,7 +128,7 @@ DLLTOOL = $(CROSS)dlltool
OPTIONS = -DSTRICT # -D__MINGW32__ OPTIONS = -DSTRICT # -D__MINGW32__
# Add "-mthreads" if you want to have threads under mingw32 # Add "-mthreads" if you want to have threads under mingw32
COMMON_THREADFLAGS = -mthreads COMMON_THREADFLAGS =
# Debugging information # Debugging information
ifeq ($(FINAL),0) ifeq ($(FINAL),0)
@@ -188,9 +186,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=