X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6474416b2ec2a63ebc28548733d93bbe5aded70d..6a54cc2a1156229f1db27ec816c9be84e8da2ee3:/src/makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index f9def2d836..ed56b11fee 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -1,19 +1,41 @@
+#
 # makeg95.env
 # Common makefile settings for wxWindows programs
-# This file is included by all the other makefiles, thus changes 
+# This file is included by all the other makefiles, thus changes
 # made here take effect everywhere (except where overriden).
 # The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32.
 #
+# Customize this file to match your own settings.
+#
+# CVS_ID: $Id$
+#
 
-# If using Cygwin, set this to 0.
-# If using Mingw32, set this to 1.
+# If using Cygwin beta, set this to 0.
+# If using Mingw32 or Cygwin 1.0 or later, set this to 1.
 MINGW32=1
 
 # Set to the version you have
 MINGW32VERSION=2.95
 
-# Set to the appropriate remove command
-RM=rm -f 
+# If building DLL, the version
+WXVERSION=23_2
+
+# Say yes if you have a "modern" linker that supports --shared option.
+# Note that you're probably going to wait forever for dlltool/gcc/etc
+# to build the DLL, so you should really use a newer linker that
+# supports --shared.
+LD_SUPPORTS_SHARED=yes
+
+# Set to the appropriate remove command (must support forward slashes)
+# You can get a suitable rm.exe from ports/mingw32/extra.zip on the ftp site.
+RM=rm -f
+
+# Set to the appropriate copy command (must support forward slashes)
+# 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 ##################################
 
@@ -21,43 +43,58 @@ RM=rm -f
 # Put a comment before --pipe for Cygwin, remove comment for Mingw32 2.95
 
 ifeq ($(MINGW32),1)
-  ifeq ($(MINGW32VERSION),2.95)
-    CC = gcc --pipe -fvtable-thunks
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+    CC = $(CROSS)gcc --pipe -fvtable-thunks
   else
-    CC = gcc
+    CC = $(CROSS)gcc
   endif
 else
-  CC = gcc
+  CC = $(CROSS)gcc
 endif
 
 # C compiler for pure C programs
 CCC = $(CC)
 
 # Compiler used for LEX generated C
-CCLEX=gcc
+CCLEX=$(CROSS)gcc
 
-MAKE=make
+# This shouldn't be needed as make is supposed to define this
+# variable itself. Uncomment it if your make complains.
+#MAKE=make
 
-# LEX
+# LEX (currently unused)
 LEX=flex # -t -L
 
-# YACC. yacc or bison
+# YACC (currently unused)
 YACC=byacc
 #YACC=bison
 
 # Settings for Cyginw/Mingw32
-RESCOMP=windres.exe
+# Some versions of windres cannot cope with the --preprocessor
+# option. Uncomment the RCPREPROCESSOR line below if yours can.
+RESCOMP=$(CROSS)windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCDEFSWITCH=--define
+# Note that this can cause windres to fail (Win95/98 problem?)
+# but commenting out RCPREPROCESSOR then does the trick.
+#RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
+
+# Don't make this too long (e.g. by adding contrib/include/wx) because it will
+# truncate the command line
+RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
-RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(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
 
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-OPTIONS= -DSTRICT # -D__MINGW32__
+# GRG: the __MINGW32__ option is not needed anymore
+# add "-DHAVE_W32API_H" if you have w32api >= 0.5
+OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information
 DEBUGFLAGS = -D__WXDEBUG__
@@ -71,7 +108,7 @@ ifeq ($(WIN95),0)
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 -D__GNUWIN32__ -D__WIN32__ # Generic WIN32
 else
-APPVER=3.50 # 4.0
+APPVER=4.0 # 3.50
 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__
 endif
@@ -93,17 +130,18 @@ WARN = -Wall
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
 GUI = -D__WXMSW__ -D__WINDOWS__
 
-# according to Guillermo Rodriguez Garcia <guille@iies.es> this flag is
-# needed to make the standard div() function work - otherwise it returns
-# absolutely incorrect results and completely breaks the wxImage class
-# (where it's used extensively)
-# GRG: at least it is needed in mingw32-gcc2.8.1
+# According to Guillermo Rodriguez Garcia <guille@iies.es>, the
+# -fno-pcc-struct-return option is needed to make the standard div()
+# function work - otherwise it returns absolutely incorrect results
+# which breaks the wxImage class. This is true at least for
+# mingw32-gcc2.8.1, don't know about others.
 OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
+AR = $(CROSS)ar
 AROPTIONS = ruv
-RANLIB = ranlib
+RANLIB = $(CROSS)ranlib
 
 # Extra compiler libraries
 COMPLIBS=
@@ -113,11 +151,11 @@ COMPPATHS=
 
 ########################## Directories ###############################
 
+OLELIBS=-lole32 -loleaut32 -luuid
 WINLIBS=-lstdc++ -lgcc \
 	-lwinspool -lwinmm -lshell32 \
 	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
-	-lole32 -loleaut32 -luuid \
-	-lodbc32 -lwsock32#  -loldnames
+	-lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) #  -loldnames
 
 #WINLIBS=-lstdc++ -lgcc \
 #	-lwinspool -lwinmm -lshell32 \
@@ -129,23 +167,28 @@ WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 
-GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 
+GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32
 
 ifeq ($(MINGW32),1)
-  ifeq ($(MINGW32),2.95)
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
     GNUWIN32EXTRA=
   endif
 endif
 
-ifeq ($(MINGW32),1)
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
-else
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 
-endif
+#ifeq ($(MINGW32),1)
+#INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
+#else
+INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32
+#endif
 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
-LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+ifdef WXUSINGDLL
+  # png, jpeg, etc are exported from wx dll, so skip and save on link time.
+  LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)
+else
+  LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS)
+endif
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
 
@@ -158,18 +201,33 @@ LDLIBS = $(LIBS)
 # OBJDIR = objects$(GUISUFFIX)
 OBJDIR = .
 
+ifdef WXMAKINGDLL
+  EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
+endif
+
+ifdef WXUSINGDLL
+  EXTRADLLFLAGS = -DWXUSINGDLL=1
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
+endif
+
+
 # You shouldn't need to change these...
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS)
+CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) $(EXTRADLLFLAGS)
+CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS) -DWIN32_LEAN_AND_MEAN
 WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
-LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
+LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
+
+.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c
 
-.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
+.c.o:
+	$(CC) -c $(CFLAGS) -o $@ $*.c
+
+.cxx.o:
+	$(CC) -c $(CPPFLAGS) -o $@ $*.cxx
 
 .$(SRCSUFF).$(OBJSUFF):
 	$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
 
-.c.o:
-	$(CC) -c $(CPPFLAGS) -o $@ $*.c