minimal now works in Unicode mode

[wxWidgets.git] / utils / wxPython / src / makefile.vc

diff --git a/utils/wxPython/src/makefile.vc b/utils/wxPython/src/makefile.vc
index 7a85a3523cdddb0a1d384e07c7d710f548319700..a9c66110de789f83b5283800abba502beae9f2ee 100644 (file)
--- a/utils/wxPython/src/makefile.vc
+++ b/utils/wxPython/src/makefile.vc
@@ -9,7 +9,7 @@
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
-VERSION=2.0b5
+VERSION=2.0b6
 
 # Set WXDIR to the root wxWindows directory for your system
 WXDIR = $(WXWIN)
@@ -45,10 +45,10 @@ THISDIR=$(WXDIR)\utils\wxPython
 EXTRALIBS=$(PYTHONDIR)\libs\python15.lib
 EXTRAINC=-I$(PYTHONDIR)\include -I.
 EXTRAFLAGS=/Fpwxp.pch /YXhelpers.h -DSWIG_GLOBAL -DHAVE_CONFIG_H
-OVERRIDEFLAGS=/GX- /DwxUSE_GLOBAL_MEMORY_OPERATORS=0
+OVERRIDEFLAGS=/GX- /DwxUSE_GLOBAL_MEMORY_OPERATORS=0 $(OTHERCFLAGS)
 
 
-SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__
+SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__ $(OTHERSWIGFLAGS)
 GENCODEDIR=msw
 
 
@@ -66,6 +66,8 @@ OBJECTS = wx.obj         helpers.obj    windows.obj    events.obj     \
          utils.obj
 !else
 
+OTHERCFLAGS=-DSEPARATE=1
+OTHERSWIGFLAGS=-DSEPARATE
 TARGET2 = utilsc
 OBJECTS2 = utils.obj
 target2=$(TARGETDIR)\$(TARGET2).pyd
@@ -274,6 +276,13 @@ dist:
 #------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.4  1999/03/05 07:22:30  RD
+# Minor wxPython changes for wxWin 2.0
+#
+# Revision 1.3  1999/02/25 07:08:33  RD
+#
+# wxPython version 2.0b5
+#
 # Revision 1.2  1999/02/20 09:03:00  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 # window handle.  If you can get the window handle into the python code,