Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to BC++ compilation in mem debug mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-06-13 14:49:26 +00:00
parent c190ab22c0
commit 3f1802b55d
12 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/samples/gizmos/multicell/makefile.b32
View File

@@ -5,6 +5,7 @@ WXDIR = $(WXWIN)
TARGET=mtest TARGET=mtest
OBJECTS = $(TARGET).obj OBJECTS = $(TARGET).obj
EXTRALIBS=$(WXDIR)\lib\gizmos.lib
!include $(WXDIR)\src\makeprog.b32 !include $(WXDIR)\src\makeprog.b32

3
contrib/samples/gizmos/splittree/makefile.b32
View File

@@ -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

4
contrib/src/ogl/basic.cpp
View File

@@ -26,6 +26,10 @@
#include <wx/wxexpr.h> #include <wx/wxexpr.h>
#ifdef new
#undef new
#endif
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#else #else

4
contrib/src/ogl/basic2.cpp
View File

@@ -26,6 +26,10 @@
#include <wx/wxexpr.h> #include <wx/wxexpr.h>
#ifdef new
#undef new
#endif
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#else #else

4
contrib/src/ogl/canvas.cpp
View File

@@ -26,6 +26,10 @@
#include <wx/wxexpr.h> #include <wx/wxexpr.h>
#ifdef new
#undef new
#endif
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#else #else

4
contrib/src/ogl/lines.cpp
View File

@@ -27,6 +27,10 @@
#include <wx/wxexpr.h> #include <wx/wxexpr.h>
#ifdef new
#undef new
#endif
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#else #else

4
contrib/src/ogl/misc.cpp
View File

@@ -28,6 +28,10 @@
#include <wx/types.h> #include <wx/types.h>
#ifdef new
#undef new
#endif
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#else #else

4
contrib/src/ogl/ogldiag.cpp
View File

@@ -26,6 +26,10 @@
#include <wx/wxexpr.h> #include <wx/wxexpr.h>
#ifdef new
#undef new
#endif
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#include <fstream.h> #include <fstream.h>

4
contrib/src/ogl/oglmisc.cpp
View File

@@ -28,6 +28,10 @@
#include <wx/types.h> #include <wx/types.h>
#ifdef new
#undef new
#endif
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <iostream.h> #include <iostream.h>
#else #else

5
contrib/src/stc/makefile.b32
View File

@@ -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 \ AutoComplete.obj \
CallTip.obj \ CallTip.obj \
CellBuffer.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 CFG = stc.cfg
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)

4
samples/typetest/typetest.cpp
View File

@@ -35,6 +35,10 @@
#include "mondrian.xpm" #include "mondrian.xpm"
#endif #endif
#ifdef new
#undef new
#endif
#include "wx/ioswrap.h" #include "wx/ioswrap.h"
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH

5
src/stc/makefile.b32
View File

@@ -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 \ AutoComplete.obj \
CallTip.obj \ CallTip.obj \
CellBuffer.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 CFG = stc.cfg
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)