X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40e1a9c025bc6098fbba2f188ef207cc68c100b3..520e470fdd0daef09c77938db642e4583933c90d:/src/makeg95.env?ds=sidebyside diff --git a/src/makeg95.env b/src/makeg95.env index bc5f856a47..9f63cdba4c 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -8,7 +8,7 @@ # 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 DEBUG='' +# make -f makefile.unix WXDEBUG='' # # You may prefer to use the GNU configure script than raw makefiles - # see contrib/wxshlib. @@ -51,23 +51,21 @@ RESFLAGS=--include-dir $(WXDIR)/include --define __WIN32__ --define __WIN95__ -- ########################## Compiler flags ############################# # Miscellaneous compiler options -# Solaris/GCC: -DSVR4 -# Solaris/GCC, dynamic library: -DSVR4 -fPIC -# FreeBDS 2.0: does not need -D_BSD - always defined -# AIX/CSet++: -+ -qsrcmsg -DSYSV -# AIX/GCC: -DSYSV -DAIX -# Data General: -DDG -# HP: -D_HPUX_SOURCE +a1 -Aa +d -z -# IRIX: -mips2 -OPTIONS= -D__MINGW32__ # -D__EGCS__ +OPTIONS= # -D__MINGW32__ # -D__EGCS__ # Debugging information # AIX: comment out. # IRIX: -g3 -DEBUGFLAGS = -ggdb -D__DEBUG__ -DDEBUG=1 +DEBUGFLAGS = -ggdb -D__WXDEBUG__ -# Debug/trace mode. 1 or more for debugging. -DEBUG=0 +# Debug/trace mode. 1 or more for memory debugging. +# Unfortunately this doesn't seem to work with GnuWin32 - get warning: +# ../../include/wx/memory.h:58: warning: declaration of `operator delete(void *)' +# throws different exceptions +# :58: warning: previous declaration here +# So setting to 0 for now. + +WXDEBUG=0 WIN95=1 @@ -95,98 +93,41 @@ RESSUFF=res RSCSUFF=rsc # Warnings -# AIX: comment out -# IRIX: -w -wlint,-fpiv -# These are for the GNU compiler. We now get the compiler to check for as -# many things as we can, to catch portability problems sooner. WARN = -Wall -# -pedantic -Wpointer-arith -Wtraditional -Wcast-align \ -# -Wenum-clash -Wnested-externs -Woverloaded-virtual \ -# -Winline -Wconversion - -# not good with too few 'const' decls in wxWindows -# -Wcast-qual -Wwrite-strings - -# too hard (problems with system header files) -# -Wstrict-prototypes -Wmissing-prototypes -# -Wredudant-decs - # Which GUI, -Dwx_xview or -Dwx_motif (don't change this) -GUI = -D__WINDOWS__ +GUI = -D__WXMSW__ -D__WINDOWS__ # Optimization # OPT = -O -# FreeBSD 2.0 with i486: OPT = -O2 -m486 -# IRIX: -O2 #-O0 : no, -O1: quick, -O2: global -O3: full(register) -# Linux: -m486 # -O2 for optimization OPT = # Options for ar archiver # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4). AROPTIONS = ruv RANLIB = ranlib -# RANLIB = echo # Uncomment this line for IRIX and Solaris # Compiler libraries: defaults to GCC libraries -# Solaris: -lgen -ldl -lsocket -lnsl -# and/or possibly -lucb, whatever that is... (-lucb CAUSES MOTIF FILE SELECTION PROBLEMS) -# or possibly -lgen -lsocket -L/usr/ccs/lib linbnsl.a -# GCC > 2.7.1 on Solaris: -lstdc++ -lc -lgen -ldl -lsocket -lnsl -lucb -# SGI: -lPW -# FreeBSD 2.0: -lg++ -lcompat -# FreeBSD 1.x: -lcompat doesn`t need, only -lg++ needed -# AIX: -lCns -lbsd -# G++ 2.7.0 requires -liostream too. -# IRIX: -lPW #COMPLIBS=-lg++ #for win95 #COMPLIBS=-lgcc # Compiler or system-specific include paths -# E.g. some SPARCStations need -# -I/usr/ucbinclude/sys -#added for win95 COMPPATHS= -# HP-specific compiler library: an AIAI convenience -HPCOMPLIBS= - -# LDLIBS for specific GUIs - -# The following for LINUX and Motif 2.0: -#MOTIFLDLIBS = -lwx_motif $(COMPLIBS) -lXm -lXmu -lXpm -lXt -lXext -lX11 -lm - -#BASICMOTIFLDLIBS = -lwx_motif /aiai/packages/motif1.2.1/motif/sun4/lib/libXm.a /aiai/packages/motif1.2.1/motif/sun4/lib/libXmu.a /aiai/packages/motif1.2.1/motif/sun4/lib/libXt.a /aiai/packages/motif1.2.1/motif/sun4/lib/libX11.a -lm -# Apparently libg++ (in COMPLIBS) should go before libXm because of a clash of -# function name: re_create. -#BASICMOTIFLDLIBS = -lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm - -#MOTIFLDLIBS = $(BASICMOTIFLDLIBS) $(COMPLIBS) - -#XVIEWLDLIBS = -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS) -#HPLDLIBS=-lwx_hp -lXm -lXmu -lXt -lX11 -lm -#CYGNUSLDLIBS= -# Default LDLIBS for XView (don't change this) -#LDLIBS = $(CYGNUSLDLIBS) - -# _ol or _motif (don't need to change, the makefiles will take -# care of it if you use motif/hp/xview targets) -#GUISUFFIX=_ol - ########################## Directories ############################### WINLIBS=-lstdc++ -lgcc \ -lwinspool -lwinmm -lshell32 -loldnames \ - -lcomctl32 -lctl3d32 -lodbc32 + -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 # 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) $(COMPPATHS) +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) @@ -203,13 +144,10 @@ LDLIBS = $(LIBS) OBJDIR = objects$(GUISUFFIX) # You shouldn't need to change these... -CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) -CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) +CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT) +CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT) LDFLAGS = -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib -# Extra patch link for XView -#XVIEW_LINK = $(WXDIR)/src/x/objects_ol/sb_scrol.o # $(WXDIR)/src/x/objects_ol/xvwinlp.o - .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c # Set these in a batch file instead e.g. install/cygnus.bat