X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b037754f53cc35e177bf6787bace26c7cecc6e1..af4088f1bebd177c33a085f892062fd1d5c64d88:/src/makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 83f77c93c8..149b18b3cb 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -1,61 +1,107 @@
+#
 # 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.
 #
-# 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=''
+# Customize this file to match your own settings.
 #
-# You may prefer to use the GNU configure script than raw makefiles -
-# see contrib/wxshlib.
+# CVS_ID: $Id$
 #
 
-########################## Compiler ##################################
+# If using Cygwin beta, set this to 0.
+# If using Mingw32 or Cygwin 1.0 or later, set this to 1.
+MINGW32=1
 
-# C++ compiler
-# For AIX/CSet++: use CC = xlC
-# For IRIX: use CC = CC
-# CC = gcc-2.6.2
-CC = gcc
+# Set to the version you have
+MINGW32VERSION=2.95
 
-# 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)
+# If building DLL, the version
+WXVERSION=232
 
-# Compiler used for LEX generated C
-CCLEX=gcc
+ifndef UNICODE
+    UNICODE=0
+endif
+
+# 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
 
-MAKE=make
+# 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
 
-# LEX
-LEX=flex.exe -t -L
+# 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
 
-# YACC. byacc or bison
-# YACC=byacc.exe
-YACC=bison.exe
+# Cross compiling? Provide the target prefix (eg., i386-mingw32-)
+# CROSS=i386-mingw32-
 
-# Resource compiler
-RESCOMP=windres.exe
+########################## Compiler ##################################
 
-RESFLAGS=--include-dir $(WXDIR)/include --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
+# C++ compiler
+# Put a comment before --pipe for Cygwin, remove comment for Mingw32 2.95
+
+ifeq ($(MINGW32),1)
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+    CC = $(CROSS)gcc --pipe -fvtable-thunks
+  else
+    CC = $(CROSS)gcc
+  endif
+else
+  CC = $(CROSS)gcc
+endif
+
+# C compiler for pure C programs
+CCC = $(CC)
+
+# Compiler used for LEX generated C
+CCLEX=$(CROSS)gcc
+
+# This shouldn't be needed as make is supposed to define this
+# variable itself. Uncomment it if your make complains.
+#MAKE=make
+
+# LEX (currently unused)
+LEX=flex # -t -L
+
+# YACC (currently unused)
+YACC=byacc
+#YACC=bison
+
+# Settings for Cyginw/Mingw32
+# 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=--use-temp-file $(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 = $(CROSS)as
+DLLTOOL = $(CROSS)dlltool
 
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-OPTIONS= # -D__MINGW32__ # -D__EGCS__
+# GRG: the __MINGW32__ option is not needed anymore
+# add "-DHAVE_W32API_H" if you have w32api >= 0.5
+OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information
-# AIX: comment out.
-# IRIX: -g3
-DEBUGFLAGS = -ggdb -D__WXDEBUG__
+DEBUGFLAGS = -D__WXDEBUG__
 
 WIN95=1
 
@@ -66,7 +112,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
@@ -88,40 +134,65 @@ WARN = -Wall
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
 GUI = -D__WXMSW__ -D__WINDOWS__
 
-# Optimization
-# OPT = -O
-OPT =
+# 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
 
-# Compiler libraries: defaults to GCC libraries
-#COMPLIBS=-lg++
-#for win95
-#COMPLIBS=-lgcc
+# Extra compiler libraries
+COMPLIBS=
 
 # Compiler or system-specific include paths
 COMPPATHS=
 
 ########################## Directories ###############################
 
-
+OLELIBS=-lole32 -loleaut32 -luuid
 WINLIBS=-lstdc++ -lgcc \
-	-lwinspool -lwinmm -lshell32 -loldnames \
-	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32
+	-lwinspool -lwinmm -lshell32 \
+	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
+	-lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) #  -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)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC)$(COMPPATHS)
-RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
 
-#LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
-LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS)
+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)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
+#else
+INC = -I$(WXDIR)/lib/msw$(INCEXT) -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"
+
+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)
 
@@ -131,30 +202,48 @@ XLIB=$(LIBS)
 LDLIBS = $(LIBS)
 
 # Directory for object files (don't change)
-OBJDIR = objects$(GUISUFFIX)
+# OBJDIR = objects$(GUISUFFIX)
+OBJDIR = .
 
-# You shouldn't need to change these...
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib
+ifeq ($(UNICODE),1)
+    UNIEXT=u
+else
+    UNIEXT=
+endif
 
-.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
+ifeq ($(WXMAKINGDLL)$(WXUSINGDLL),)
+    INCEXT=$(UNIEXT)
+else
+    INCEXT=dll$(UNIEXT)
+endif
+
+ifdef WXMAKINGDLL
+  EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
+endif
+
+ifdef WXUSINGDLL
+  EXTRADLLFLAGS = -DWXUSINGDLL=1
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
+endif
 
-# 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)
+# You shouldn't need to change these...
+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 -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
+
+.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c
 
-.$(RESSUFF).$(RSCSUFF): $<
-	$(CVTRES) $< $*.$(RSCSUFF)
+.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