added (back?) CROSS support (patch 658234)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4d0d77affc
commit
eb76cc945b
@ -66,6 +66,10 @@ MINGW32VERSION=3.0
|
|||||||
# on the command line like so: make WINE=1 -f makefile.g95
|
# on the command line like so: make WINE=1 -f makefile.g95
|
||||||
#WINE=1
|
#WINE=1
|
||||||
|
|
||||||
|
# Set this if you are using a cross-compiler, i.e. compiling on one system
|
||||||
|
# the program for another one
|
||||||
|
# CROSS=i386-mingw32-
|
||||||
|
|
||||||
# If we're using MSYS, or other utilities that use forward slashes,
|
# If we're using MSYS, or other utilities that use forward slashes,
|
||||||
# you need to set this when invoking the makefile from DOS, or the
|
# you need to set this when invoking the makefile from DOS, or the
|
||||||
# wrong separators will be assumed. However, if you're using MSYS,
|
# wrong separators will be assumed. However, if you're using MSYS,
|
||||||
@ -168,8 +172,8 @@ endif
|
|||||||
|
|
||||||
# Define the C++ and C compiler respectively
|
# Define the C++ and C compiler respectively
|
||||||
ifndef WINE
|
ifndef WINE
|
||||||
CXX = g++
|
CXX = $(CROSS)g++
|
||||||
CC = gcc
|
CC = $(CROSS)gcc
|
||||||
else
|
else
|
||||||
CXX = wineg++
|
CXX = wineg++
|
||||||
CC = winegcc
|
CC = winegcc
|
||||||
@ -177,7 +181,7 @@ endif
|
|||||||
|
|
||||||
# Compiler used for LEX generated C
|
# Compiler used for LEX generated C
|
||||||
# For now at least, it can be the same as the regular C compiler
|
# For now at least, it can be the same as the regular C compiler
|
||||||
CCLEX = $(CC)
|
CCLEX = $(CROSS)$(CC)
|
||||||
|
|
||||||
# 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.
|
||||||
@ -194,7 +198,7 @@ CCLEX = $(CC)
|
|||||||
# 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.
|
||||||
ifndef WINE
|
ifndef WINE
|
||||||
RESCOMP=windres $(_USE_TEMP_FILE_IF_SUPPORTED)
|
RESCOMP=$(CROSS)windres $(_USE_TEMP_FILE_IF_SUPPORTED)
|
||||||
else
|
else
|
||||||
RESCOMP=wrc
|
RESCOMP=wrc
|
||||||
endif
|
endif
|
||||||
@ -211,8 +215,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 = as
|
AS = $(CROSS)as
|
||||||
DLLTOOL = dlltool
|
DLLTOOL = $(CROSS)dlltool
|
||||||
|
|
||||||
########################## Compiler flags #############################
|
########################## Compiler flags #############################
|
||||||
|
|
||||||
@ -286,8 +290,8 @@ endif
|
|||||||
|
|
||||||
# Options for ar archiver
|
# Options for ar archiver
|
||||||
AROPTIONS = ruv
|
AROPTIONS = ruv
|
||||||
AR = ar
|
AR = $(CROSS)ar
|
||||||
RANLIB = ranlib
|
RANLIB = $(CROSS)ranlib
|
||||||
|
|
||||||
# Extra compiler libraries
|
# Extra compiler libraries
|
||||||
COMPLIBS=
|
COMPLIBS=
|
||||||
|
Loading…
Reference in New Issue
Block a user