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

Watcom C++ mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-07 15:22:05 +00:00
parent 2432b92dd7
commit 8a2c6ef8d1
68 changed files with 821 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/ftp.cpp
View File

@@ -80,7 +80,7 @@ wxFTP::~wxFTP()
////////////////////////////////////////////////////////////////
////// wxFTP connect and login methods /////////////////////////
////////////////////////////////////////////////////////////////
bool wxFTP::Connect(wxSockAddress& addr)
bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
{
if (!m_handler) {
m_lastError = wxPROTO_NOHNDLR;

2
src/common/http.cpp
View File

@@ -166,7 +166,7 @@ bool wxHTTP::Connect(const wxString& host)
return TRUE;
}
bool wxHTTP::Connect(wxSockAddress& addr)
bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
{
struct sockaddr *raw_addr;
size_t len;

2
src/common/list.cpp
View File

@@ -56,6 +56,8 @@
// wxListKey
// -----------------------------------------------------------------------------
wxListKey wxDefaultListKey;
bool wxListKey::operator==(wxListKeyValue value) const
{
switch ( m_keyType )

7
src/common/url.cpp
View File

@@ -250,7 +250,8 @@ wxInputStream *wxURL::GetInputStream(void)
addr.Service(m_servname);
if (!m_protocol->Connect(addr)) {
if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
{
m_error = wxURL_CONNERR;
return NULL;
}
@@ -281,7 +282,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
addr.Hostname(hostname);
addr.Service(port);
g_proxy->Connect(addr);
g_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
}
void wxURL::SetProxy(const wxString& url_proxy)
@@ -306,7 +307,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
addr.Hostname(hostname);
addr.Service(port);
m_proxy.Connect(addr);
m_proxy.Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
m_protocol = &m_proxy;
m_protoname = "proxy";

13
src/makeprog.wat
View File

@@ -21,12 +21,19 @@ $(LNK) : makefile.wat
@%append $(LNK) $(STACK)
@%append $(LNK) name $(PROGRAM).exe
@%append $(LNK) file $(WXLIB)\wx.lib
@for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
@for %i in ($(OBJECTS)) do @%append $(LNK) file %i
# @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
# @%append $(LNK) $(MINDATA)
# @%append $(LNK) $(MAXDATA)
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-erase *.obj
-erase *.bak
-erase *.err
-erase *.pch
-erase *.lib
-erase *.lnk
-erase *.res
-erase *.exe
-erase *.lbc

6
src/makewat.env
View File

@@ -51,7 +51,9 @@ WATLIBDIR = $(WATCOMDIR)\lib386\nt
MINDATA =
MAXDATA =
STACK = option stack=64k
EXTRALIBS = $(WATLIBDIR)\ctl3d32.lib $(WATLIBDIR)\odbc32.lib
EXTRALIBS = $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
$(WATLIBDIR)\odbc32.lib $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
$(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\uuid.lib
IFLAGS = -i=$(WXINC) -i=$(%watcom)\h;$(%watcom)\h\nt # -i=$(WXDIR)\include\wx\msw\gnuwin32
RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include
RESFLAGS2 = -R $(name) /i$(WXDIR)\include
@@ -67,7 +69,7 @@ RESFLAGS2 = -R $(name) /i$(WXDIR)\include
OPTFLAGS=/ox /5r
# /d1 for line numbers only: anything else produces an enormous wx32.lib
CPPFLAGS = /bt=nt /w1 /D__WIN32__ /D__WIN95__ /D__WINDOWS__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 $(DEBUGFLAGS) /d__WXMSW__ $(EXTRACPPFLAGS) # /d__WATCOMC__
CPPFLAGS = /bt=nt /w1 /DWIN32 /D__WIN32__ /D__WIN95__ /D__WINDOWS__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 $(DEBUGFLAGS) /d__WXMSW__ $(EXTRACPPFLAGS) # /d__WATCOMC__
.cpp.obj: # $< # .AUTODEPEND
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<

4
src/msw/app.cpp
View File

@@ -561,7 +561,7 @@ int wxEntry(WXHINSTANCE hInstance,
int nCmdShow,
bool enterLoop)
{
#if !defined(__WXDEBUG__) && !defined(__BORLANDC__) // take everything into a try-except block in release build
#if !defined(__WXDEBUG__) && !defined(__BORLANDC__) && !defined(__WATCOMC__) // take everything into a try-except block in release build
try {
#endif
@@ -631,7 +631,7 @@ int wxEntry(WXHINSTANCE hInstance,
wxApp::CleanUp();
return retValue;
#if !defined(__WXDEBUG__) && !defined(__BORLANDC__) // catch exceptions only in release build
#if !defined(__WXDEBUG__) && !defined(__BORLANDC__) && !defined(__WATCOMC__) // catch exceptions only in release build
}
except ( EXCEPTION_EXECUTE_HANDLER ) {
/*

121
src/msw/makefile.wat
View File

@@ -16,9 +16,8 @@ LIBTARGET = $(WXLIB)\wx.lib
DUMMY=dummydll
# ODBCLIB = ..\..\contrib\odbc\odbc32.lib
EXTRATARGETS = # wxxpm
EXTRATARGETSCLEAN = # clean_wxxpm
EXTRATARGETS = xpm png zlib
EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
GENDIR=$(WXDIR)\src\generic
COMMDIR=$(WXDIR)\src\common
XPMDIR=$(WXDIR)\src\xpm
@@ -114,7 +113,7 @@ COMMONOBJS = cmndata.obj &
# db.obj &
# dbtable.obj &
MSWOBJS1 = &
MSWOBJS = &
accel.obj &
app.obj &
bitmap.obj &
@@ -169,7 +168,6 @@ MSWOBJS1 = &
palette.obj &
pen.obj &
penwin.obj &
pnghand.obj &
printdlg.obj &
printwin.obj &
radiobox.obj &
@@ -199,6 +197,8 @@ MSWOBJS1 = &
wave.obj &
window.obj &
# pnghand.obj &
OLEOBJS = &
droptgt.obj &
dropsrc.obj &
@@ -207,33 +207,28 @@ OLEOBJS = &
uuid.obj &
automtn.obj
XPMOBJECTS = crbuffri.obj&
crdatfri.obj&
create.obj crifrbuf.obj&
crifrdat.obj&
data.obj&
hashtab.obj misc.obj&
parse.obj rdftodat.obj&
rdftoi.obj&
rgb.obj scan.obj&
simx.obj wrffrdat.obj&
wrffrp.obj wrffri.obj
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS) # $(XPMOBJECTS)
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS)
all: $(OBJECTS) $(LIBTARGET)
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
wlib /b /c /n /p=512 $^@ @tmp.lbc
#test : $(OBJECTS)
# %create tmp.lbc
# @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
# wlib /b /c /n /p=512 $^@ @tmp.lbc
clean: .SYMBOLIC
clean: $(EXTRATARGETSCLEAN)
-erase *.obj
-erase $(LIBTARGET)
-erase *.pch
-erase *.err
-erase *.lbc
cleanall: clean
@@ -825,15 +820,85 @@ wrffri.obj: $(XPMDIR)\wrffri.c
wrffrp.obj: $(XPMDIR)\wrffrp.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
trees$(O)
OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
infutil$(O) inffast$(O)
#wxxpm: .SYMBOLIC
# cd $(WXDIR)\contrib\wxxpm
# wmake -f makefile.wat all
# cd $(WXDIR)\src\msw
all: $(LIBTARGET)
#clean_wxxpm: .SYMBOLIC
# cd $(WXDIR)\contrib\wxxpm
# wmake -f makefile.wat clean
# cd $(WXDIR)\src\msw
adler32.obj: adler32.c zutil.h zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
compress.obj: compress.c zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
crc32.obj: crc32.c zutil.h zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
gzio.obj: gzio.c zutil.h zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
infcodes.h infutil.h
$(CC) -c $(CFLAGS) $*.c
infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
infcodes.h inffast.h
$(CC) -c $(CFLAGS) $*.c
inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
$(CC) -c $(CFLAGS) $*.c
inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
$(CC) -c $(CFLAGS) $*.c
infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
$(CC) -c $(CFLAGS) $*.c
inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
$(CC) -c $(CFLAGS) $*.c
trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
uncompr.obj: uncompr.c zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
zutil.obj: zutil.c zutil.h zlib.h zconf.h
$(CC) -c $(CFLAGS) $*.c
xpm: .SYMBOLIC
cd $(WXDIR)\src\xpm
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
clean_xpm: .SYMBOLIC
cd $(WXDIR)\src\xpm
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
png: .SYMBOLIC
cd $(WXDIR)\src\png
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
clean_png: .SYMBOLIC
cd $(WXDIR)\src\png
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
zlib: .SYMBOLIC
cd $(WXDIR)\src\zlib
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
clean_zlib: .SYMBOLIC
cd $(WXDIR)\src\zlib
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw

40
src/png/makefile.wat Normal file
View File

@@ -0,0 +1,40 @@
#!/binb/wmake.exe
#
# File: makefile.wat
# Author: Julian Smart
# Created: 1998
#
# Makefile : Builds PNG library for Watcom C++, WIN32
WXDIR = ..\..
!include $(WXDIR)\src\makewat.env
WXLIB = $(WXDIR)\lib
LIBTARGET = $(WXLIB)\png.lib
OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj &
pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj &
pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
all: $(OBJECTS) $(LIBTARGET)
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
wlib /b /c /n /p=512 $^@ @tmp.lbc
clean: .SYMBOLIC
-erase *.obj
-erase $(LIBTARGET)
-erase *.pch
-erase *.err
-erase *.lbc
cleanall: clean
#accel.obj: $(MSWDIR)\accel.cpp
# *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

54
src/xpm/makefile.wat Normal file
View File

@@ -0,0 +1,54 @@
#!/binb/wmake.exe
#
# File: makefile.wat
# Author: Julian Smart
# Created: 1998
#
# Makefile : Builds XPM library for Watcom C++, WIN32
WXDIR = ..\..
!include $(WXDIR)\src\makewat.env
WXLIB = $(WXDIR)\lib
LIBTARGET = $(WXLIB)\xpm.lib
OBJECTS = crbuffri.obj &
crdatfri.obj &
create.obj &
crifrbuf.obj &
crifrdat.obj &
data.obj &
hashtab.obj &
misc.obj &
parse.obj &
rdftodat.obj &
rdftoi.obj &
rgb.obj &
scan.obj &
simx.obj &
wrffrdat.obj &
wrffrp.obj &
wrffri.obj
all: $(OBJECTS) $(LIBTARGET)
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
wlib /b /c /n /p=512 $^@ @tmp.lbc
clean: .SYMBOLIC
-erase *.obj
-erase $(LIBTARGET)
-erase *.pch
-erase *.err
-erase *.lbc
cleanall: clean
#accel.obj: $(MSWDIR)\accel.cpp
# *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

4
src/zlib/makefile.wat
View File

@@ -29,7 +29,9 @@ OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
OBJP3=infutil$(O)+inffast$(O)
all: test
# all: test
all: $(LIBTARGET)
adler32.obj: adler32.c zutil.h zlib.h zconf.h
$(CC) $(CFLAGS) $*.c