Bug fix to scrolwin.cpp (position not set in SetScrollbars); redundant variable

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index bc5f856a474fc1e4d9a5c7f6b5f07fb7a37c84d0..2a0ace01a58fbe127ba43bd1e0dc884c4baf9e91 100644 (file)
--- 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.
@@ -59,15 +59,15 @@ RESFLAGS=--include-dir $(WXDIR)/include --define __WIN32__ --define __WIN95__ --
 # 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
+WXDEBUG=0
 
 WIN95=1
 
@@ -113,7 +113,7 @@ WARN = -Wall
 # -Wredudant-decs
 
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
-GUI = -D__WINDOWS__
+GUI = -D__WXMSW__
 
 # Optimization
 # OPT = -O
@@ -186,7 +186,7 @@ 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)/src/zlib $(EXTRAINC)$(COMPPATHS)
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
@@ -203,8 +203,8 @@ 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