security fix to wxSingleInstanceChecker: check if the lock file was really created...

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index eb146ba325a68ea06466a1de5eb8a2a2de8ebf33..f235603377533b316caa780460b3c5c9d6b07818 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -66,6 +66,10 @@ MINGW32VERSION=3.0
 # on the command line like so: make WINE=1 -f makefile.g95
 #WINE=1
 
 # on the command line like so: make WINE=1 -f makefile.g95
 #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,
 # you need to set this when invoking the makefile from DOS, or the
 # wrong separators will be assumed. However, if you're using MSYS,
 # 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
 # wrong separators will be assumed. However, if you're using MSYS,


@@ -168,8 +172,8 @@ endif
 
 # Define the C++ and C compiler respectively
 ifndef WINE
 
 # Define the C++ and C compiler respectively
 ifndef WINE

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

 else
 CXX = wineg++
 CC = winegcc
 else
 CXX = wineg++
 CC = winegcc


@@ -177,7 +181,7 @@ endif
 
 # Compiler used for LEX generated C
 # For now at least, it can be the same as the regular C compiler
 
 # Compiler used for LEX generated C
 # 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
 # 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.


@@ -194,7 +198,7 @@ CCLEX = $(CC)
 # Some versions of windres cannot cope with the --preprocessor
 # option. Uncomment the RCPREPROCESSOR line below if yours can.
 ifndef WINE
 # Some versions of windres cannot cope with the --preprocessor
 # option. Uncomment the RCPREPROCESSOR line below if yours can.
 ifndef WINE

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

 else
 RESCOMP=wrc
 endif
 else
 RESCOMP=wrc
 endif


@@ -211,8 +215,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 #############################
 


@@ -286,8 +290,8 @@ endif
 
 # Options for ar archiver
 AROPTIONS = ruv
 
 # Options for ar archiver
 AROPTIONS = ruv

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

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