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

Removed streams from VC++ makefile for now; corrected typo in log.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-13 09:15:56 +00:00
parent ddfc206782
commit db138a4c2a
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/log.h
View File

@@ -331,7 +331,7 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
#define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode()) #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
#else //!debug #else //!debug
inline void wxLogApiError(const char *, long) { } inline void wxLogApiError(const char *, long) { }
inline void wxLogLastErrror(const char *) { } inline void wxLogLastError(const char *) { }
#endif //debug/!debug #endif //debug/!debug
#endif //__LOGH__ #endif //__LOGH__

11
src/common/stream.cpp
View File

@@ -13,6 +13,17 @@
#pragma implementation "stream.h" #pragma implementation "stream.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/setup.h"
#endif
#include "wx/object.h" #include "wx/object.h"
#include "wx/stream.h" #include "wx/stream.h"

11
src/msw/makefile.nt
View File

@@ -107,16 +107,13 @@ COMMONOBJS = \
$(COMMDIR)\time.obj \ $(COMMDIR)\time.obj \
$(COMMDIR)\wxexpr.obj \ $(COMMDIR)\wxexpr.obj \
$(COMMDIR)\y_tab.obj \ $(COMMDIR)\y_tab.obj \
$(COMMDIR)\stream.obj \
$(COMMDIR)\fstream.obj \
$(COMMDIR)\mstream.obj \
$(COMMDIR)\datstrm.obj \
$(COMMDIR)\extended.obj \ $(COMMDIR)\extended.obj \
$(COMMDIR)\process.obj $(COMMDIR)\process.obj
# $(COMMDIR)\wxstrgnu\wxstrgnu.obj \ # $(COMMDIR)\fstream.obj \
# $(COMMDIR)\wxstrgnu\wxregex.obj \ # $(COMMDIR)\mstream.obj \
# $(COMMDIR)\matrix.obj \ # $(COMMDIR)\datstrm.obj \
# $(COMMDIR)\stream.obj \
MSWOBJS = \ MSWOBJS = \
$(MSWDIR)\app.obj \ $(MSWDIR)\app.obj \

4
src/ntwxwin.mak
View File

@@ -141,9 +141,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
MAKEPRECOMP=/YcWX/WXPREC.H MAKEPRECOMP=/YcWX/WXPREC.H
!endif !endif
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__WXDEBUG__ /DWXDEBUG=1
# If you don't include wxprec.h, use CPPFLAGS2 # If you don't include wxprec.h, use CPPFLAGS2
CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1 CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__WXDEBUG__ /DWXDEBUG=1
LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
DUMMY=dummy DUMMY=dummy