AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More Watcom C++ compilation stuff

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-10-24 13:07:26 +00:00
parent 99a49d3e67
commit 0cdf89abb1
9 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/tmake/wat.t
View File

@ -3,7 +3,7 @@
#! Purpose: tmake template file from which makefile.wat is generated by running
#! tmake -t wat wxwin.pro -o makefile.wat
#! TODO:
#! - unzip.c must be compiled with $(CC), not $(CCC).
#! - extended.c, unzip.c must be compiled with $(CC), not $(CCC).
#! - extended.c, unzip.c targets must be as per b32.t etc.
#! - OLE files not generated correctly (need 'ole/' directory)
#! Author: Vadim Zeitlin

8
include/wx/msw/setup0.h
View File

@ -396,6 +396,14 @@
#define wxUSE_ODBC 0
#endif
#if defined(__WXMSW__) && defined(__WATCOMC__)
#undef wxUSE_ODBC
#define wxUSE_ODBC 0
#undef wxUSE_LIBJPEG
#define wxUSE_LIBJPEG 0
#endif
#if defined(__WXMSW__) && !defined(__WIN32__)
#undef wxUSE_THREADS

2
src/makewat.env
View File

@ -54,7 +54,7 @@ STACK = option stack=64k
LIBS = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
$(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
$(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib &
$(WATLIBDIR)\uuid.lib # $(WATLIBDIR)\odbc32.lib
$(WATLIBDIR)\uuid.lib $(WATLIBDIR)\odbc32.lib
IFLAGS = -i=$(WXINC) -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\include\wx\msw\gnuwin32
RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include
RESFLAGS2 = -R $(name) /i$(WXDIR)\include

6
src/msw/makefile.wat
View File

@ -405,7 +405,7 @@ gdiobj.obj: $(MSWDIR)\gdiobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gsocket.obj: $(MSWDIR)\gsocket.c
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
helpwin.obj: $(MSWDIR)\helpwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -446,7 +446,7 @@ msgdlg.obj: $(MSWDIR)\msgdlg.cpp
nativdlg.obj: $(MSWDIR)\nativdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
oleutils.obj: $(MSWDIR)\oleutils.cpp
oleutils.obj: $(MSWDIR)\ole\oleutils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
ownerdrw.obj: $(MSWDIR)\ownerdrw.cpp
@ -620,7 +620,7 @@ event.obj: $(COMMDIR)\event.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
extended.obj: $(COMMDIR)\extended.c
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
ffile.obj: $(COMMDIR)\ffile.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<

2
src/msw/ownerdrw.cpp
View File

@ -218,7 +218,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2,
rc.y + (m_nHeight - nBmpHeight) /2,
nBmpWidth, nBmpHeight,
&dcMem, 0, 0, wxCOPY,true);
&dcMem, 0, 0, wxCOPY, TRUE);
if ( st & wxODSelected ) {
#ifdef O_DRAW_NATIVE_API

2
src/msw/spinbutt.cpp
View File

@ -209,7 +209,7 @@ bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
#ifndef __GNUWIN32__
#ifdef __BORLANDC__
#if defined(__BORLANDC__) || defined(__WATCOMC__)
LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;

8
src/wxvc.dsp
View File

@ -103,6 +103,10 @@ SOURCE=.\common\ctrlcmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\ctrlsub.cpp
# End Source File
# Begin Source File
SOURCE=.\common\date.cpp
# End Source File
# Begin Source File
@ -256,6 +260,10 @@ SOURCE=.\common\layout.cpp
# End Source File
# Begin Source File
SOURCE=.\common\lboxcmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\list.cpp
# End Source File
# Begin Source File

8
src/wxvc6.dsp
View File

@ -109,6 +109,10 @@ SOURCE=.\common\ctrlcmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\ctrlsub.cpp
# End Source File
# Begin Source File
SOURCE=.\common\date.cpp
# End Source File
# Begin Source File
@ -262,6 +266,10 @@ SOURCE=.\common\layout.cpp
# End Source File
# Begin Source File
SOURCE=.\common\lboxcmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\list.cpp
# End Source File
# Begin Source File

8
src/wxvc_dll.dsp
View File

@ -116,6 +116,10 @@ SOURCE=.\common\ctrlcmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\ctrlsub.cpp
# End Source File
# Begin Source File
SOURCE=.\common\date.cpp
# End Source File
# Begin Source File
@ -264,6 +268,10 @@ SOURCE=.\common\layout.cpp
# End Source File
# Begin Source File
SOURCE=.\common\lboxcmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\list.cpp
# End Source File
# Begin Source File