Fixes to BC++ compilation in mem debug mode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/gizmos/multicell/makefile.b32 b/contrib/samples/gizmos/multicell/makefile.b32
index 202df2787d68b419d84fc8329af0c3663cc828a8..d597e75a449ddc4ec50c71f128c249da758b1a44 100644 (file)
--- a/contrib/samples/gizmos/multicell/makefile.b32
+++ b/contrib/samples/gizmos/multicell/makefile.b32
@@ -5,6 +5,7 @@ WXDIR = $(WXWIN)
 
 TARGET=mtest
 OBJECTS = $(TARGET).obj
 
 TARGET=mtest
 OBJECTS = $(TARGET).obj

+EXTRALIBS=$(WXDIR)\lib\gizmos.lib

 
 !include $(WXDIR)\src\makeprog.b32
 
 
 !include $(WXDIR)\src\makeprog.b32
 

diff --git a/contrib/samples/gizmos/splittree/makefile.b32 b/contrib/samples/gizmos/splittree/makefile.b32
index d1cbad638b12c7f9f91dee10fccd1032a75f652f..fdde09ccbe33162de9e7dc1f4618e68bb837f320 100644 (file)
--- a/contrib/samples/gizmos/splittree/makefile.b32
+++ b/contrib/samples/gizmos/splittree/makefile.b32
@@ -9,8 +9,9 @@
 
 WXDIR = $(WXWIN)
 
 
 WXDIR = $(WXWIN)
 

-TARGET=minimal
+TARGET=tree

 OBJECTS = $(TARGET).obj
 OBJECTS = $(TARGET).obj

+EXTRALIBS=$(WXDIR)\lib\gizmos.lib

 
 !include $(WXDIR)\src\makeprog.b32
 
 
 !include $(WXDIR)\src\makeprog.b32
 

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index 2d53683a9421db51ae27292116867c8222be0f60..dc375630999fb4026e9034e1107cd1fe6d017a1c 100644 (file)
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -26,6 +26,10 @@
 
 #include <wx/wxexpr.h>
 
 
 #include <wx/wxexpr.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else

diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
index 7a65d7097caea36d7eaa31482cd4c737e316a95e..1cac6443a640eb67fbd2be674a40195c43a9ff7a 100644 (file)
--- a/contrib/src/ogl/basic2.cpp
+++ b/contrib/src/ogl/basic2.cpp
@@ -26,6 +26,10 @@
 
 #include <wx/wxexpr.h>
 
 
 #include <wx/wxexpr.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else

diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp
index 02bae38143268ddc909252ae2b63b72efe55bc7f..e05066d4029f247c3796d4af920f5f92aa6b59a5 100644 (file)
--- a/contrib/src/ogl/canvas.cpp
+++ b/contrib/src/ogl/canvas.cpp
@@ -26,6 +26,10 @@
 
 #include <wx/wxexpr.h>
 
 
 #include <wx/wxexpr.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else

diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
index 069a4eda4a06e3e278f0911e1889bff524ee8080..fb7322ab3e72deb538f9706de59479609f9b45cd 100644 (file)
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@@ -27,6 +27,10 @@
 
 #include <wx/wxexpr.h>
 
 
 #include <wx/wxexpr.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else

diff --git a/contrib/src/ogl/misc.cpp b/contrib/src/ogl/misc.cpp
index 4a2e76673456bc70ad5a879f956043355024388e..169fc2c484451e8c41d7c798a9f83175e3eb6cf4 100644 (file)
--- a/contrib/src/ogl/misc.cpp
+++ b/contrib/src/ogl/misc.cpp
@@ -28,6 +28,10 @@
 
 #include <wx/types.h>
 
 
 #include <wx/types.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else

diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
index 2eac01591a692eef7c72428b3f58ef29eff1b8fa..4d7e36843ca053c8c7055c8e7bdac59edf87f85c 100644 (file)
--- a/contrib/src/ogl/ogldiag.cpp
+++ b/contrib/src/ogl/ogldiag.cpp
@@ -26,6 +26,10 @@
 
 #include <wx/wxexpr.h>
 
 
 #include <wx/wxexpr.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>

diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp
index 4a2e76673456bc70ad5a879f956043355024388e..169fc2c484451e8c41d7c798a9f83175e3eb6cf4 100644 (file)
--- a/contrib/src/ogl/oglmisc.cpp
+++ b/contrib/src/ogl/oglmisc.cpp
@@ -28,6 +28,10 @@
 
 #include <wx/types.h>
 
 
 #include <wx/types.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else

diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32
index 0d86478b7c09bab65625557c9c3168b7ab7e84fe..8e602b4098643d30d5a126f492be5443baf2cd74 100644 (file)
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -18,10 +18,9 @@ S=$(SCINTILLA)\src
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 

-LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
+LIBTARGET=$(WXDIR)\lib\stc.lib

 
 OBJECTS = \
 
 OBJECTS = \

-       Accessor.obj            \

        AutoComplete.obj        \
        CallTip.obj             \
        CellBuffer.obj          \
        AutoComplete.obj        \
        CallTip.obj             \
        CellBuffer.obj          \


@@ -56,6 +55,8 @@ OBJECTS = \
 
 !include $(WXDIR)\src\makelib.b32
 
 
 !include $(WXDIR)\src\makelib.b32
 

+all: stc.cfg $(LIBTARGET)
+

 CFG = stc.cfg
 CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 CFG = stc.cfg
 CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 4e86e887694539d47e4b7a9903dee21bc1592d0c..03d9ff3f6249087fbcff5d19fd8d59c1d1461699 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -35,6 +35,10 @@
 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif
 

+#ifdef new
+#undef new
+#endif
+

 #include "wx/ioswrap.h"
 
 #if wxUSE_IOSTREAMH
 #include "wx/ioswrap.h"
 
 #if wxUSE_IOSTREAMH

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 0d86478b7c09bab65625557c9c3168b7ab7e84fe..8e602b4098643d30d5a126f492be5443baf2cd74 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -18,10 +18,9 @@ S=$(SCINTILLA)\src
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
 

-LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
+LIBTARGET=$(WXDIR)\lib\stc.lib

 
 OBJECTS = \
 
 OBJECTS = \

-       Accessor.obj            \

        AutoComplete.obj        \
        CallTip.obj             \
        CellBuffer.obj          \
        AutoComplete.obj        \
        CallTip.obj             \
        CellBuffer.obj          \


@@ -56,6 +55,8 @@ OBJECTS = \
 
 !include $(WXDIR)\src\makelib.b32
 
 
 !include $(WXDIR)\src\makelib.b32
 

+all: stc.cfg $(LIBTARGET)
+

 CFG = stc.cfg
 CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 CFG = stc.cfg
 CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)