X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63aea43ffd5b04ef0c6d246d44e2b162363e4bf8..8535af00e277ee89c877e9cb3ac357791119f497:/src/makeg95.env?ds=inline

diff --git a/src/makeg95.env b/src/makeg95.env
index 2b5dc81b6e..7dfcb53b0a 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -1,38 +1,58 @@
+#
 # makeg95.env
 # Common makefile settings for wxWindows programs
 # 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.
 #
-# An alternative to editing this file is to create a shell script
-# to export specific variables, and call make with the -e switch
-# to override makefile variables. See wx/install/install.txt.
-# And you can override specific variables on the make command line, e.g.
-#
-# make -f makefile.unix WXDEBUG=''
-#
-# You may prefer to use the GNU configure script than raw makefiles -
-# see contrib/wxshlib.
+# CVS_ID: $Id$
 #
 
+# If using Cygwin, set this to 0.
+# If using Mingw32, set this to 1.
+MINGW32=1
+
+# Set to the version you have
+MINGW32VERSION=2.95
+
+# If building DLL, the version
+WXVERSION=21_11
+
+# 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
+RM=rm -f 
+
+# Set to the appropriate copy command and separator
+COPY=cp
+
 ########################## Compiler ##################################
 
 # C++ compiler
-# For AIX/CSet++: use CC = xlC
-# For IRIX: use CC = CC
-# CC = gcc-2.6.2
-CC = gcc
+# Put a comment before --pipe for Cygwin, remove comment for Mingw32 2.95
+
+ifeq ($(MINGW32),1)
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+    CC = gcc --pipe -fvtable-thunks
+  else
+    CC = gcc
+  endif
+else
+  CC = gcc
+endif
 
 # C compiler for pure C programs
-# Typical: CC=g++ , CCC=gcc
-#          CC=cl386 /Tp, CCC=cl386
-#
-# (Used only for XView, file sb_scrol.c)
-#
 CCC = $(CC)
 
 # Compiler used for LEX generated C
 CCLEX=gcc
 
+# GRG: This shouldn't be here! make is supposed to define the
+# MAKE variable itself.
 MAKE=make
 
 # LEX
@@ -43,23 +63,26 @@ YACC=byacc
 #YACC=bison
 
 # Settings for Cyginw/Mingw32
-RESCOMP=windres.exe
+RESCOMP=windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCDEFSWITCH=--define
 
-RESFLAGS=$(RCINCSWITCH) $(WXDIR)\include $(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 = as
+DLLTOOL = dlltool
 
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-OPTIONS= -D__EGCS__  -DSTRICT # -D__MINGW32__
+# GRG: the __MINGW32__ option is not needed anymore
+OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information
-# AIX: comment out.
-# IRIX: -g3
-DEBUGFLAGS = -ggdb -D__WXDEBUG__
+DEBUGFLAGS = -D__WXDEBUG__
 
 WIN95=1
 
@@ -92,45 +115,65 @@ WARN = -Wall
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
 GUI = -D__WXMSW__ -D__WINDOWS__
 
-# Optimization
-# OPT = -O
-
-# according to Guillermo Rodriguez Garcia <guille@iies.es> this flag is needed
-# to make the standard div() functio work - otherwise it returns absolutely
-# incorrect results and completely breaks the wxImage class (where it's used
-# extensively)
-OPT = -fno-pcc-struct-return
+# 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 = ar
 AROPTIONS = ruv
 RANLIB = ranlib
 
-# Compiler libraries: defaults to GCC libraries
-#COMPLIBS=-lg++
-#for win95
-#COMPLIBS=-lgcc
+# Extra compiler libraries
+COMPLIBS=
 
 # Compiler or system-specific include paths
 COMPPATHS=
 
 ########################## Directories ###############################
 
-
 WINLIBS=-lstdc++ -lgcc \
 	-lwinspool -lwinmm -lshell32 \
-	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 #  -loldnames
+	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
+	-lole32 -loleaut32 -luuid \
+	-lodbc32 -lwsock32#  -loldnames
+
+#WINLIBS=-lstdc++ -lgcc \
+#	-lwinspool -lwinmm -lshell32 \
+#    -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames
 
 # Shouldn't need to change these...
-WXSRC=$(WXDIR)\src\msw
-WXINC=$(WXDIR)\include
-WXBASESRC=$(WXDIR)\src\common
-WXLIB=$(WXDIR)\lib\$(LIBPREFIX)wx.$(LIBSUFF)
-INC = -I$(WXINC) -I$(WXDIR)\src\png -I$(WXDIR)\src\jpeg -I$(WXDIR)\include\wx\msw\gnuwin32 -I$(WXDIR)\src\zlib $(EXTRAINC) $(COMPPATHS)
-RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
+WXSRC=$(WXDIR)/src/msw
+WXINC=$(WXDIR)/include
+WXBASESRC=$(WXDIR)/src/common
+WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 
-#LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
-LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 
+
+ifeq ($(MINGW32),1)
+  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 -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
+else
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -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"
+
+ifdef WXUSINGDLL
+  # png, jpeg, etc are exported from wx dll, so skip and save on link time.
+  LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+else
+  LIBS = $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+endif
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
 
@@ -141,30 +184,31 @@ LDLIBS = $(LIBS)
 
 # Directory for object files (don't change)
 # 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)
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
-# Set these in a batch file instead e.g. install/cygnus.bat
-#	RCINCLUDE="$(WXDIR)/include/msw;$(WXDIR)/contrib/fafa;$(WXDIR)/contrib/itsybits"; \
-#	CPLUS_INCLUDE_PATH=/usr/H-i386-cygwin32/i386-cygwin32/include:/usr/H-i386-cygwin32/lib/gcc-lib/i386-cygwin32/cygnus-2.7.2-961023/include:$(WXDIR)/include/common:$(WXDIR)/include/msw:$(WXDIR)/contrib/fafa:$(WXDIR)/contrib/itsybits; \
-#	export CPLUS_INCLUDE_PATH RCINCLUDE;  \
-
-#.rc.$(RESSUFF):  $< $(WXDIR)/include/msw/wx.rc
-#	$(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS)
-
-#.$(RESSUFF).$(RSCSUFF): $<
-#	$(CVTRES) $< $*.$(RSCSUFF)
-
 .$(SRCSUFF).$(OBJSUFF):
 	$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) -o $@ $*.c
+	$(CC) -c $(CFLAGS) -o $@ $*.c