From 3f1802b55dc7cdcd972e1cdce5e512b267ca3b05 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 13 Jun 2001 14:49:26 +0000 Subject: [PATCH] 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 --- contrib/samples/gizmos/multicell/makefile.b32 | 1 + contrib/samples/gizmos/splittree/makefile.b32 | 3 ++- contrib/src/ogl/basic.cpp | 4 ++++ contrib/src/ogl/basic2.cpp | 4 ++++ contrib/src/ogl/canvas.cpp | 4 ++++ contrib/src/ogl/lines.cpp | 4 ++++ contrib/src/ogl/misc.cpp | 4 ++++ contrib/src/ogl/ogldiag.cpp | 4 ++++ contrib/src/ogl/oglmisc.cpp | 4 ++++ contrib/src/stc/makefile.b32 | 5 +++-- samples/typetest/typetest.cpp | 4 ++++ src/stc/makefile.b32 | 5 +++-- 12 files changed, 41 insertions(+), 5 deletions(-) diff --git a/contrib/samples/gizmos/multicell/makefile.b32 b/contrib/samples/gizmos/multicell/makefile.b32 index 202df2787d..d597e75a44 100644 --- 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 +EXTRALIBS=$(WXDIR)\lib\gizmos.lib !include $(WXDIR)\src\makeprog.b32 diff --git a/contrib/samples/gizmos/splittree/makefile.b32 b/contrib/samples/gizmos/splittree/makefile.b32 index d1cbad638b..fdde09ccbe 100644 --- a/contrib/samples/gizmos/splittree/makefile.b32 +++ b/contrib/samples/gizmos/splittree/makefile.b32 @@ -9,8 +9,9 @@ WXDIR = $(WXWIN) -TARGET=minimal +TARGET=tree OBJECTS = $(TARGET).obj +EXTRALIBS=$(WXDIR)\lib\gizmos.lib !include $(WXDIR)\src\makeprog.b32 diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp index 2d53683a94..dc37563099 100644 --- a/contrib/src/ogl/basic.cpp +++ b/contrib/src/ogl/basic.cpp @@ -26,6 +26,10 @@ #include +#ifdef new +#undef new +#endif + #if wxUSE_IOSTREAMH #include #else diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp index 7a65d7097c..1cac6443a6 100644 --- a/contrib/src/ogl/basic2.cpp +++ b/contrib/src/ogl/basic2.cpp @@ -26,6 +26,10 @@ #include +#ifdef new +#undef new +#endif + #if wxUSE_IOSTREAMH #include #else diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp index 02bae38143..e05066d402 100644 --- a/contrib/src/ogl/canvas.cpp +++ b/contrib/src/ogl/canvas.cpp @@ -26,6 +26,10 @@ #include +#ifdef new +#undef new +#endif + #if wxUSE_IOSTREAMH #include #else diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp index 069a4eda4a..fb7322ab3e 100644 --- a/contrib/src/ogl/lines.cpp +++ b/contrib/src/ogl/lines.cpp @@ -27,6 +27,10 @@ #include +#ifdef new +#undef new +#endif + #if wxUSE_IOSTREAMH #include #else diff --git a/contrib/src/ogl/misc.cpp b/contrib/src/ogl/misc.cpp index 4a2e766734..169fc2c484 100644 --- a/contrib/src/ogl/misc.cpp +++ b/contrib/src/ogl/misc.cpp @@ -28,6 +28,10 @@ #include +#ifdef new +#undef new +#endif + #if wxUSE_IOSTREAMH #include #else diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp index 2eac01591a..4d7e36843c 100644 --- a/contrib/src/ogl/ogldiag.cpp +++ b/contrib/src/ogl/ogldiag.cpp @@ -26,6 +26,10 @@ #include +#ifdef new +#undef new +#endif + #if wxUSE_IOSTREAMH #include #include diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp index 4a2e766734..169fc2c484 100644 --- a/contrib/src/ogl/oglmisc.cpp +++ b/contrib/src/ogl/oglmisc.cpp @@ -28,6 +28,10 @@ #include +#ifdef new +#undef new +#endif + #if wxUSE_IOSTREAMH #include #else diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32 index 0d86478b7c..8e602b4098 100644 --- 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) -LIBTARGET=$(WXDIR)\contrib\lib\stc.lib +LIBTARGET=$(WXDIR)\lib\stc.lib OBJECTS = \ - Accessor.obj \ AutoComplete.obj \ CallTip.obj \ CellBuffer.obj \ @@ -56,6 +55,8 @@ OBJECTS = \ !include $(WXDIR)\src\makelib.b32 +all: stc.cfg $(LIBTARGET) + CFG = stc.cfg CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index 4e86e88769..03d9ff3f62 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -35,6 +35,10 @@ #include "mondrian.xpm" #endif +#ifdef new +#undef new +#endif + #include "wx/ioswrap.h" #if wxUSE_IOSTREAMH diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32 index 0d86478b7c..8e602b4098 100644 --- 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) -LIBTARGET=$(WXDIR)\contrib\lib\stc.lib +LIBTARGET=$(WXDIR)\lib\stc.lib OBJECTS = \ - Accessor.obj \ AutoComplete.obj \ CallTip.obj \ CellBuffer.obj \ @@ -56,6 +55,8 @@ OBJECTS = \ !include $(WXDIR)\src\makelib.b32 +all: stc.cfg $(LIBTARGET) + CFG = stc.cfg CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) -- 2.45.2