wxUpdateUIEvent derives from wxCommandEvent now

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 84ced2d245311209e1354873d6e5dc96a3d14848..d9aa03c77650db8520e71f3e3c33cc1aadef65bc 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -101,19 +101,8 @@ RSCSUFF=rsc
 # many things as we can, to catch portability problems sooner.
 WARN = -Wall
 
 # 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)
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)

-GUI = -D__WINDOWS__
+GUI = -D__WXMSW__ -D__WINDOWS__

 
 # Optimization
 # OPT = -O
 
 # Optimization
 # OPT = -O


@@ -126,7 +115,6 @@ OPT =
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
 AROPTIONS = ruv
 RANLIB = ranlib
 # 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
 
 # Compiler libraries: defaults to GCC libraries
 # Solaris: -lgen -ldl -lsocket -lnsl


@@ -149,31 +137,6 @@ RANLIB = ranlib
 #added for win95
 COMPPATHS=
 
 #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 ###############################
 
 
 ########################## Directories ###############################
 
 


@@ -186,7 +149,7 @@ WXSRC=$(WXDIR)/src/msw
 WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 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)
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)


@@ -207,9 +170,6 @@ CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEB
 CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT)
 LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib
 
 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
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
 # Set these in a batch file instead e.g. install/cygnus.bat