From: Julian Smart Date: Wed, 27 May 1998 09:37:56 +0000 (+0000) Subject: Changes to help with Win16 compilation. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f0b3249bf72b325c3345f1910d0497f1bf623630 Changes to help with Win16 compilation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/string.cpp b/src/common/string.cpp index 611b5969de..0de23bf158 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -890,10 +890,13 @@ size_t wxString::find(const wxString& str, size_t nStart) const return p == NULL ? npos : p - c_str(); } +// VC++ 1.5 can't cope with the default argument in the header. +#if ! (defined(_MSC_VER) && !defined(__WIN32__)) size_t wxString::find(const char* sz, size_t nStart, size_t n) const { return find(wxString(sz, n == npos ? 0 : n), nStart); } +#endif size_t wxString::find(char ch, size_t nStart) const { @@ -919,6 +922,8 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const return npos; } +// VC++ 1.5 can't cope with the default argument in the header. +#if ! (defined(_MSC_VER) && !defined(__WIN32__)) size_t wxString::rfind(const char* sz, size_t nStart, size_t n) const { return rfind(wxString(sz, n == npos ? 0 : n), nStart); @@ -932,6 +937,7 @@ size_t wxString::rfind(char ch, size_t nStart) const return p == NULL ? npos : p - c_str(); } +#endif wxString wxString::substr(size_t nStart, size_t nLen) const { diff --git a/src/makemsc.env b/src/makemsc.env new file mode 100644 index 0000000000..d19ffee4da --- /dev/null +++ b/src/makemsc.env @@ -0,0 +1,75 @@ +# +# File: makemsc.env +# Author: Julian Smart +# Created: 1993 +# Updated: +# Copyright: (c) 1993, AIAI, University of Edinburgh +# +# "%W% %G%" +# +# Include file for MS VC++ makefiles +# Arguments: +# +# FINAL=1 argument to nmake to build version with no debugging info. +# DLL=1 builds a library (wxdll.lib) suitable for creating DLLs. +# +# Set WXDIR to the wxWindows directory if env. variable WXWIN not set. +# From your specific makefile, set EXTRAFLAGS to add flags to CPPFLAGS, +# such as extra include directories or defines. + +WXDIR = $(WXWIN) +WXINC = $(WXDIR)\include + +WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib + +# Suffixes +OBJSUFF=obj +SRCSUFF=cpp + +INC=/I$(WXDIR)\include + +# Set this to nothing if using MS C++ 7 +ZOPTION=/Z7 + +!ifndef FINAL +FINAL=0 +!endif + +!ifndef DLL +DLL=0 +!endif + +!ifndef DEBUG +DEBUG=0 +!endif + +OPTIONS= + +!if "$(FINAL)" == "0" +OPT = /Od /Gy +DEBUG_FLAGS= /Zi $(ZOPTION) +LINK_DEBUG_FLAGS=/CO +!else +OPT = /Od /Gy # Note: /Ox or /Os crash the compiler or samples +DEBUG_FLAGS= +LINK_DEBUG_FLAGS= +!endif + +LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem $(WXDIR)\src\msw\ctl3d\msvc\ctl3dv2.lib + +!if "$(DLL)" == "0" +PCH=WX.PCH +PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) +CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DDEBUG=$(DEBUG) /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ $(PRECOMP) +CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DDEBUG=$(DEBUG) /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ +LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE +DUMMY=dummy +!else +PCH=WX.PCH +PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) +CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WINDOWS__ $(PRECOMP) +CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WINDOWS__ +LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE +DUMMY=dummydll +!endif + diff --git a/src/msw/ctl3d/ctl3d.dll b/src/msw/ctl3d/ctl3d.dll index 74f3db72c6..8e1b74c3a8 100644 Binary files a/src/msw/ctl3d/ctl3d.dll and b/src/msw/ctl3d/ctl3d.dll differ diff --git a/src/msw/ctl3d/ctl3d32.dll b/src/msw/ctl3d/ctl3d32.dll index a4d26ed923..fc2126896e 100644 Binary files a/src/msw/ctl3d/ctl3d32.dll and b/src/msw/ctl3d/ctl3d32.dll differ diff --git a/src/msw/ctl3d/ctl3dv2.dll b/src/msw/ctl3d/ctl3dv2.dll index 7db141d43f..1799fd951b 100644 Binary files a/src/msw/ctl3d/ctl3dv2.dll and b/src/msw/ctl3d/ctl3dv2.dll differ diff --git a/src/msw/ctl3d/msvc/ctl3d.lib b/src/msw/ctl3d/msvc/ctl3d.lib index 2bd74e2114..3fe7168589 100644 Binary files a/src/msw/ctl3d/msvc/ctl3d.lib and b/src/msw/ctl3d/msvc/ctl3d.lib differ diff --git a/src/msw/ctl3d/msvc/ctl3dv2.lib b/src/msw/ctl3d/msvc/ctl3dv2.lib index 9d40989142..8e35c80b91 100644 Binary files a/src/msw/ctl3d/msvc/ctl3dv2.lib and b/src/msw/ctl3d/msvc/ctl3dv2.lib differ diff --git a/src/msw/ctl3d/wat32/import32.zip b/src/msw/ctl3d/wat32/import32.zip index 69f318ccbd..ca98307520 100644 Binary files a/src/msw/ctl3d/wat32/import32.zip and b/src/msw/ctl3d/wat32/import32.zip differ diff --git a/src/msw/ctl3d/wat386/ctl3d32.obj b/src/msw/ctl3d/wat386/ctl3d32.obj index 2fe3045625..11c666054f 100644 Binary files a/src/msw/ctl3d/wat386/ctl3d32.obj and b/src/msw/ctl3d/wat386/ctl3d32.obj differ diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak index 3e3f25415b..a499babbdf 100644 --- a/src/ntwxwin.mak +++ b/src/ntwxwin.mak @@ -144,9 +144,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\src\msw\wx.pdb MAKEPRECOMP=/YcWX/WXPREC.H !endif -CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WINDOWS__ /DDEBUG=$(DEBUG) $(INC) $(OPT) $(EXTRADLLFLAGS) /MDd /GX # /D_DEBUG +CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WINDOWS__ /DDEBUG=$(DEBUG) $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX # /D_DEBUG # If you don't include wxprec.h, use CPPFLAGS2 -CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WINDOWS__ /DDEBUG=$(DEBUG) $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MDd /GX # /D_DEBUG +CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WINDOWS__ /DDEBUG=$(DEBUG) $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX # /D_DEBUG LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup DUMMY=dummy