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

Partial Watcom C++ 10.6 support added (doesn't link for some reason)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1998-12-18 23:18:59 +00:00
parent 28ab302b70
commit 7be1f0d91a
13 changed files with 2361 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/msw.rsp
View File

@ -12,6 +12,7 @@ src/makeb32.env
src/makebcc.env
src/makemsw.env
src/makewat.env
src/makeprog.wat
src/makesc.env
src/makeg95.env
src/makem95.env

11
docs/msw/install.txt
View File

@ -71,6 +71,17 @@ Borland C++ 4.5/5.0 compilation
NOTE: only a few samples have up-to-date makefiles, e.g.
minimal, docview, mdi. The utils makefile does not yet work.
Watcom C++ 10.6 compilation
---------------------------
Currently under construction, but so far we have:
1. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to
make the wxWindows core library.
2. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
to make this sample. There are a lot of link errors at this
point, so can anyone help work out what I've done wrong?
Gnu-Win32 b19/b20/Mingw32 compilation
-------------------------------------

2
include/wx/defs.h
View File

@ -122,6 +122,8 @@
#define bool unsigned int
#elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
typedef unsigned int bool;
#elif defined(__WATCOMC__)
typedef unsigned int bool;
#elif defined(__SUNCC__)
// If we use int, we get identically overloaded functions in config.cpp
typedef unsigned char bool;

3
include/wx/ownerdrw.h
View File

@ -132,4 +132,5 @@ private:
m_nMarginWidth; // space occupied by bitmap to the left of the item
};
#endif //_OWNERDRW_H
#endif
// _OWNERDRW_H

2
include/wx/string.h
View File

@ -87,6 +87,8 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
return _stricmp(psz1, psz2);
#elif defined(__BORLANDC__)
return stricmp(psz1, psz2);
#elif defined(__WATCOMC__)
return stricmp(psz1, psz2);
#elif defined(__UNIX__) || defined(__GNUWIN32__)
return strcasecmp(psz1, psz2);
#else

7
src/common/cmndata.cpp
View File

@ -33,10 +33,15 @@
#ifdef __WXMSW__
#include <windows.h>
#ifndef __WIN32__
#if !defined(__WIN32__)
#include <print.h>
#include <commdlg.h>
#endif
#if defined(__WATCOMC__)
#include <commdlg.h>
#endif
#endif
#if !USE_SHARED_LIBRARY

10
src/common/filefn.cpp
View File

@ -71,7 +71,8 @@
#include "wx/setup.h"
#if defined(HAVE_FNMATCH_H) || defined(__GNUWIN32__)
// No, Cygwin doesn't appear to have fnmatch.h after all.
#if defined(HAVE_FNMATCH_H)
#include "fnmatch.h"
#endif
@ -846,7 +847,7 @@ wxRenameFile (const wxString& file1, const wxString& file2)
bool wxRemoveFile(const wxString& file)
{
#if defined(_MSC_VER) || defined(__BORLANDC__)
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
int flag = remove(WXSTRINGCAST file);
#else
int flag = unlink(WXSTRINGCAST file);
@ -1406,7 +1407,7 @@ bool wxIsWild( const wxString& pattern )
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
#if defined(HAVE_FNMATCH_H) || defined(__GNUWIN32__)
#if defined(HAVE_FNMATCH_H)
{
if(dot_special)
return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
@ -1415,7 +1416,8 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
}
#else
#pragma error Broken implementation of wxMatchWild() -- needs fixing!
// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
/*
* WARNING: this code is broken!
*/

5
src/common/textfile.cpp
View File

@ -136,6 +136,10 @@ wxTextFile::Type wxTextFile::GuessType() const
: n##t1 > n##t2 ? Type_##t1 \
: Type_##t2
// Watcom C++ doesn't seem to be able to handle the macro
#if defined(__WATCOMC__)
return typeDefault;
#else
if ( nDos > nUnix )
return GREATER_OF(Dos, Mac);
else if ( nDos < nUnix )
@ -144,6 +148,7 @@ wxTextFile::Type wxTextFile::GuessType() const
// nDos == nUnix
return nMac > nDos ? Type_Mac : typeDefault;
}
#endif
#undef GREATER_OF
}

32
src/makeprog.wat Normal file
View File

@ -0,0 +1,32 @@
WXDIR = $(%WXWIN)
!include $(WXDIR)\src\makewat.env
WXLIB = $(WXDIR)\lib
LNK = $(PROGRAM).lnk
all: $(PROGRAM).exe
$(PROGRAM).exe : $(OBJECTS) $(PROGRAM).res $(LNK) $(WXLIB)\wx.lib
wlink @$(LNK)
$(BINDCOMMAND) $(PROGRAM).res
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(RC) $(RESFLAGS1) $(PROGRAM).rc
$(LNK) : makefile.wat
%create $(LNK)
@%append $(LNK) debug all
@%append $(LNK) system $(LINKOPTION)
@%append $(LNK) $(STACK)
@%append $(LNK) name $(PROGRAM).exe
@%append $(LNK) file $(WXLIB)\wx.lib
@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

107
src/makewat.env
View File

@ -10,15 +10,13 @@
FINAL=0
WATCOMDIR=$(%WATCOM)
#.EXTENSIONS: .exe .obj .c .cc .cpp .res .rc .def
# Set this to win386 if compiling under WIN386 mode, or
# to windows for normal 16-bit Windows, nt if compiling for WIN32s/NT
MODE= nt # windows
.EXTENSIONS:
.EXTENSIONS: .exe .obj .c .cc .cpp .res .rc .def
WXDIR = c:\wx
WXINC = $(WXDIR)\include\msw
WXBASEINC = $(WXDIR)\include\base
#WXDIR = d:\wx2\wxwind~1
WXDIR = $(%WXWIN)
WXINC = $(WXDIR)\include
# Suffixes
OBJSUFF=obj
@ -30,74 +28,16 @@ WXDEBUG=0
PRECOMP = /fh=$(WXDIR)\src\msw\watcom.pch
!endif
!ifeq WXDEBUG 1
DEBUGFLAGS = /D__WXDEBUG__
DEBUGINFO = debug all
!else
DEBUGFLAGS =
DEBUGINFO =
!endif
RC = wrc
!ifeq MODE win386
##### WIN386 OPTIONS
# Set LEVEL to 386 if using 32-bit compilation
LEVEL = 386
CCC = wpp$(LEVEL)
CC = wcc$(LEVEL)
OS_TARGET = win386
MODEL =
LINKOPTION = win386
BINDCOMMAND = wbind
WATLIBDIR = $(WATCOMDIR)\lib386\win
MINDATA = option mindata=100K
MAXDATA = option maxdata=100K
STACK = option stack=64k
EXTRALIBS = $(WXDIR)\contrib\ctl3d\ctl3d32.obj
IFLAGS = -i=$(WXINC) -i=$(WXBASEINC) -i=$(WXDIR)\contrib\fafa -i=$(%watcom)\h;$(%watcom)\h\win
RESFLAGS1 = -r -bt=windows /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
RESFLAGS2 = -R $(name) /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
DEBUGINFO = debug all
#CPPFLAGS = /zw /w1 /zq /d2 /d__WIN386__ /zt4 $(MODEL) /d__WXMSW__
CPPFLAGS = /zw /w1 /zq /d1 /d__WIN386__ $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)
!endif
#### END WIN386 MODE
!ifeq MODE windows
##### 16-BIT WINDOWS OPTIONS
# Set LEVEL to 386 if using 32-bit compilation
LEVEL =
CCC = wpp$(LEVEL)
CC = wcc$(LEVEL)
OS_TARGET = windows
MODEL =/ml
LINKOPTION = windows
BINDCOMMAND = echo
WATLIBDIR = $(WATCOMDIR)\lib286\win
MINDATA =
MAXDATA =
STACK =
EXTRALIBS=$(WATLIBDIR)\shell.lib $(WATLIBDIR)\ddeml.lib $(WATLIBDIR)\ctl3d.lib $(WATLIBDIR)\commdlg.lib $(WATLIBDIR)\mmsystem.lib
IFLAGS = -i=$(WXINC) -i=$(WXBASEINC) -i=$(WXDIR)\contrib\fafa
RESFLAGS1 = -r -bt=windows -i=$(WXINC) -i=$(WXDIR)\contrib\fafa
RESFLAGS2 = -R
DEBUGINFO = debug all
#-i=$(WXDIR)\contrib\itsybits
# Note: I've added the data threshold (/zt4) for 16-bit operation,
# or we get link failure (TEXT segment overflow). Is this OK for
# 32-bit mode also? -- JACS
# An alternative might be /zc (put string literals in code segment).
#CPPFLAGS = /zw /w1 /zq /d1 /zt4 $(MODEL) /d__WXMSW__
CPPFLAGS = /zw /w2 /zq /d1 $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)
!endif
#### END WINDOWS MODE
!ifeq MODE nt
##### NT OPTIONS
LEVEL = 386
CCC = wpp$(LEVEL)
CC = wcc$(LEVEL)
@ -112,12 +52,9 @@ MINDATA =
MAXDATA =
STACK = option stack=64k
EXTRALIBS = $(WATLIBDIR)\ctl3d32.lib $(WATLIBDIR)\odbc32.lib
IFLAGS = -i=$(WXINC) -i=$(WXBASEINC) -i=$(WXDIR)\contrib\fafa -i=$(%watcom)\h;$(%watcom)\h\nt
RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
RESFLAGS2 = -R $(name) /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
DEBUGINFO = debug all # Linking: comment out if operating in a non-debuggable environment
#-i=$(WXDIR)\contrib\itsybits
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
# Here are some possible optimization flags:
# /5r Pentium timings
@ -127,22 +64,14 @@ DEBUGINFO = debug all # Linking: comment out if operating in a non-debuggable
# The Watcom-recommended flags for optimum Pentium speed are:
# /oneatx /zp4 /5 /fpi87 /fp5
OPTFLAGS=/ox /5r # /DWXDEBUG=1
OPTFLAGS=/ox /5r
# /d1 for line numbers only: anything else produces an enormous wx32.lib
CPPFLAGS = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WXMSW__ $(EXTRACPPFLAGS)
!endif
#### END NT MODE
CPPFLAGS = /bt=nt /w1 /D__WIN32__ /D__WIN95__ /D__WINDOWS__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 $(DEBUGFLAGS) /d__WXMSW__ $(EXTRACPPFLAGS) # /d__WATCOMC__
.cpp.obj: # $< # .AUTODEPEND
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
# %create tmp.lbc
# @%append tmp.lbc $(CPPFLAGS) $(IFLAGS) $<
# echo $<
# $(CCC) @tmp.lbc
.c.obj: # $< # .AUTODEPEND
*$(CC) $(CPPFLAGS) $(IFLAGS) $<

899
src/msw/makefile.wat
View File

@ -1,13 +1,10 @@
#!/binb/wmake.exe
#
# File: makefile.wat
# Author: Edward C. Zimmermann <edz@crg.net>
# Created: 1994
# Updated: Dmitri Chubraev, Nov.1994 <chubraev@iem.ee.ethz.ch>
# RCS_ID $Id$
# Author: Julian Smart
# Created: 1998
#
# Makefile : Builds wxWindows library for Windows 3.1
# and Watcom C++
# Makefile : Builds wxWindows library for Watcom C++, WIN32
WXDIR = ..\..
@ -15,145 +12,811 @@ WXDIR = ..\..
WXLIB = $(WXDIR)\lib
LIBTARGET = $(WXLIB)\wx$(LEVEL).lib
LIBTARGET = $(WXLIB)\wx.lib
DUMMY=dummydll
#CTL3DOBJ = ..\..\contrib\ctl3d\ctl3d32.obj
#CTL3DLIB = ..\..\contrib\ctl3d\win32s\ctl3d32.lib
FAFALIB = ..\..\contrib\fafa\fafa.lib
#ODBCLIB = ..\..\contrib\odbc\odbc32.lib
GAUGELIB = ..\..\contrib\gauge\gauge.lib
ITSYLIB = ..\..\contrib\itsybits\itsy.lib
WXSTRINGLIB = ..\..\contrib\wxstring\wxstring.lib
WXXPMLIB = ..\..\contrib\wxxpm\wxxpm.lib
PROIOLIB = ..\..\utils\prologio\lib\prologio.lib
DIBLIB = ..\..\utils\dib\dib.lib
RCPARSERLIB = ..\..\utils\rcparser\lib\rcparser.lib
ODBCLIB = ..\..\contrib\odbc\odbc32.lib
EXTRAMODULES = $(GAUGELIB) $(ITSYLIB) $(PROIOLIB) $(DIBLIB) $(WXSTRINGLIB) $(RCPARSERLIB) $(FAFALIB) # $(WXXPMLIB)
EXTRATARGETS = fafa gauge itsy prologio dib rcparser wxstring # wxxpm
EXTRATARGETSCLEAN = clean_fafa clean_gauge clean_itsy clean_proio clean_dib clean_rcp clean_wxstring # clean_wxxpm
EXTRATARGETS = # wxxpm
EXTRATARGETSCLEAN = # clean_wxxpm
OBJECTS = wx_win.obj wx_frame.obj wx_panel.obj wx_utils.obj &
wx_item.obj wx_text.obj wx_gdi.obj wx_dialg.obj wx_canvs.obj wx_dc.obj &
wx_mf.obj wx_ipc.obj wx_timer.obj wx_clipb.obj wx_vlbox.obj &
wx_stat.obj wx_scrol.obj wx_buttn.obj wx_messg.obj wx_check.obj wx_choic.obj &
wx_rbox.obj wx_lbox.obj wx_group.obj wx_gauge.obj wx_txt.obj wx_mtxt.obj &
wx_slidr.obj wx_menu.obj wx_db.obj wx_cmdlg.obj wx_main.obj wx_combo.obj
GENDIR=$(WXDIR)\src\generic
COMMDIR=$(WXDIR)\src\common
XPMDIR=$(WXDIR)\src\xpm
OLEDIR=ole
MSWDIR=$(WXDIR)\src\msw
BASEOBJECTS = ..\base\wb_win.obj ..\base\wb_frame.obj ..\base\wb_panel.obj &
..\base\wb_utils.obj ..\base\wx_lay.obj ..\base\wx_doc.obj ..\base\wb_res.obj &
..\base\wb_main.obj ..\base\wb_item.obj ..\base\wb_list.obj ..\base\wb_obj.obj &
..\base\wb_text.obj ..\base\wb_gdi.obj ..\base\wb_dialg.obj ..\base\wb_canvs.obj &
..\base\wb_dc.obj ..\base\wb_mf.obj ..\base\wb_ps.obj ..\base\wx_enhdg.obj &
..\base\wb_hash.obj ..\base\wb_ipc.obj ..\base\wb_form.obj ..\base\wb_timer.obj &
..\base\wb_help.obj ..\base\wb_sysev.obj ..\base\wb_stdev.obj ..\base\wb_types.obj &
..\base\wb_mgstr.obj ..\base\wb_data.obj ..\base\wb_stat.obj &
..\base\wb_scrol.obj ..\base\wb_vlbox.obj ..\base\wb_print.obj ..\base\wx_tbar.obj &
..\base\wx_bbar.obj ..\base\wx_mem.obj ..\base\wx_date.obj ..\base\wb_cmdlg.obj &
..\base\wx_time.obj ..\base\wx_frac.obj
DOCDIR = $(WXDIR)\docs
# This now replaced by contrib\wxstring
#..\base\wxstring.obj
GENERICOBJS= choicdgg.obj &
gridg.obj &
laywin.obj &
panelg.obj &
sashwin.obj &
scrolwin.obj &
splitter.obj &
statusbr.obj &
tabg.obj &
textdlgg.obj
all: base $(EXTRATARGETS) erasepch $(LIBTARGET)
# These are generic things that don't need to be compiled on MSW,
# but sometimes it's useful to do so for testing purposes.
NONESSENTIALOBJS= printps.obj &
prntdlgg.obj &
msgdlgg.obj &
helpxlp.obj &
colrdlgg.obj &
fontdlgg.obj &
postscrp.obj
base: .SYMBOLIC
cd ..\base
wmake -f makefile.wat all OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)" LEVEL=$(LEVEL)
cd ..\msw
COMMONOBJS = cmndata.obj &
config.obj &
docview.obj &
docmdi.obj &
dynarray.obj &
dynlib.obj &
event.obj &
file.obj &
filefn.obj &
fileconf.obj &
framecmn.obj &
gdicmn.obj &
image.obj &
intl.obj &
ipcbase.obj &
helpbase.obj &
layout.obj &
log.obj &
memory.obj &
module.obj &
odbc.obj &
object.obj &
prntbase.obj &
resource.obj &
tbarbase.obj &
tbarsmpl.obj &
textfile.obj &
timercmn.obj &
utilscmn.obj &
validate.obj &
valtext.obj &
date.obj &
hash.obj &
list.obj &
string.obj &
socket.obj &
sckaddr.obj &
sckfile.obj &
sckipc.obj &
sckstrm.obj &
url.obj &
http.obj &
protocol.obj &
time.obj &
tokenzr.obj &
wxexpr.obj &
y_tab.obj &
extended.obj &
process.obj &
wfstream.obj &
mstream.obj &
zstream.obj &
stream.obj &
datstrm.obj &
objstrm.obj &
variant.obj &
wincmn.obj
$(LIBTARGET) : $(OBJECTS) $(BASEOBJECTS) $(EXTRAMODULES)
# Can't compile this yet under Watcom C++
# db.obj &
# dbtable.obj &
MSWOBJS1 = &
accel.obj &
app.obj &
bitmap.obj &
bmpbuttn.obj &
brush.obj &
button.obj &
checkbox.obj &
checklst.obj &
choice.obj &
clipbrd.obj &
colordlg.obj &
colour.obj &
combobox.obj &
control.obj &
curico.obj &
cursor.obj &
data.obj &
dc.obj &
dcmemory.obj &
dcclient.obj &
dcprint.obj &
dcscreen.obj &
dde.obj &
dialog.obj &
dib.obj &
dibutils.obj &
dirdlg.obj &
filedlg.obj &
font.obj &
fontdlg.obj &
frame.obj &
gauge95.obj &
gaugemsw.obj &
gdiobj.obj &
helpwin.obj &
icon.obj &
imaglist.obj &
iniconf.obj &
joystick.obj &
listbox.obj &
listctrl.obj &
main.obj &
mdi.obj &
menu.obj &
menuitem.obj &
metafile.obj &
minifram.obj &
msgdlg.obj &
nativdlg.obj &
notebook.obj &
ownerdrw.obj &
palette.obj &
pen.obj &
penwin.obj &
pnghand.obj &
printdlg.obj &
printwin.obj &
radiobox.obj &
radiobut.obj &
region.obj &
registry.obj &
regconf.obj &
scrolbar.obj &
settings.obj &
slidrmsw.obj &
slider95.obj &
spinbutt.obj &
statbmp.obj &
statbox.obj &
statbr95.obj &
stattext.obj &
tabctrl.obj &
taskbar.obj &
tbar95.obj &
tbarmsw.obj &
textctrl.obj &
thread.obj &
timer.obj &
treectrl.obj &
utils.obj &
utilsexc.obj &
wave.obj &
window.obj &
OLEOBJS = &
droptgt.obj &
dropsrc.obj &
dataobj.obj &
oleutils.obj &
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)
all: $(OBJECTS) $(LIBTARGET)
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
@for %i in ( $(BASEOBJECTS) ) do @%append tmp.lbc +%i
@for %i in ( $(EXTRAMODULES) ) do @%append tmp.lbc +%i
wlib /b /c /n /p=512 $^@ @tmp.lbc
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch
cd ..\base
wmake -f makefile.wat clean
-erase $(LIBTARGET)
cd ..\msw
-erase *.obj
-erase $(LIBLARGET)
-erase *.pch
cleanall: clean $(EXTRATARGETSCLEAN)
cleanall: clean
fafa: .SYMBOLIC
cd $(WXDIR)\contrib\fafa
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
accel.obj: $(MSWDIR)\accel.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
clean_fafa: .SYMBOLIC
cd $(WXDIR)\contrib\fafa
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
app.obj: $(MSWDIR)\app.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
itsy: .SYMBOLIC
cd $(WXDIR)\contrib\itsybits
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
bitmap.obj: $(MSWDIR)\bitmap.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
clean_itsy: .SYMBOLIC
cd $(WXDIR)\contrib\itsybits
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
bmpbuttn.obj: $(MSWDIR)\bmpbuttn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gauge: .SYMBOLIC
cd $(WXDIR)\contrib\gauge
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
brush.obj: $(MSWDIR)\brush.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
clean_gauge: .SYMBOLIC
cd $(WXDIR)\contrib\gauge
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
button.obj: $(MSWDIR)\button.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wxxpm: .SYMBOLIC
cd $(WXDIR)\contrib\wxxpm
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
choice.obj: $(MSWDIR)\choice.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
clean_wxxpm: .SYMBOLIC
cd $(WXDIR)\contrib\wxxpm
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
checkbox.obj: $(MSWDIR)\checkbox.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dib: .SYMBOLIC
cd $(WXDIR)\utils\dib
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
checklst.obj: $(MSWDIR)\checklst.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
clean_dib: .SYMBOLIC
cd $(WXDIR)\utils\dib
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
clipbrd.obj: $(MSWDIR)\clipbrd.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
prologio: .SYMBOLIC
cd $(WXDIR)\utils\prologio\src
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
colordlg.obj: $(MSWDIR)\colordlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
clean_proio: .SYMBOLIC
cd $(WXDIR)\utils\prologio\src
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
colour.obj: $(MSWDIR)\colour.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
rcparser: .SYMBOLIC
cd $(WXDIR)\utils\rcparser\src
wmake -f makefile.wat all
cd $(WXDIR)\src\msw
combobox.obj: $(MSWDIR)\combobox.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wxstring: .SYMBOLIC
cd $(WXDIR)\contrib\wxstring
wmake -f makefile.wat all OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)"
cd $(WXDIR)\src\msw
control.obj: $(MSWDIR)\control.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
curico.obj: $(MSWDIR)\curico.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
cursor.obj: $(MSWDIR)\cursor.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
data.obj: $(MSWDIR)\data.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dde.obj: $(MSWDIR)\dde.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dc.obj: $(MSWDIR)\dc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dcmemory.obj: $(MSWDIR)\dcmemory.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dcclient.obj: $(MSWDIR)\dcclient.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dcprint.obj: $(MSWDIR)\dcprint.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dcscreen.obj: $(MSWDIR)\dcscreen.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dialog.obj: $(MSWDIR)\dialog.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dib.obj: $(MSWDIR)\dib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dibutils.obj: $(MSWDIR)\dibutils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dirdlg.obj: $(MSWDIR)\dirdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
filedlg.obj: $(MSWDIR)\filedlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
font.obj: $(MSWDIR)\font.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
fontdlg.obj: $(MSWDIR)\fontdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
frame.obj: $(MSWDIR)\frame.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gauge95.obj: $(MSWDIR)\gauge95.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gaugemsw.obj: $(MSWDIR)\gaugemsw.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gdiobj.obj: $(MSWDIR)\gdiobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
icon.obj: $(MSWDIR)\icon.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imaglist.obj: $(MSWDIR)\imaglist.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
joystick.obj: $(MSWDIR)\joystick.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
listbox.obj: $(MSWDIR)\listbox.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
listctrl.obj: $(MSWDIR)\listctrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
main.obj: $(MSWDIR)\main.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
mdi.obj: $(MSWDIR)\mdi.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
menu.obj: $(MSWDIR)\menu.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
menuitem.obj: $(MSWDIR)\menuitem.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
metafile.obj: $(MSWDIR)\metafile.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
minifram.obj: $(MSWDIR)\minifram.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
msgdlg.obj: $(MSWDIR)\msgdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
nativdlg.obj: $(MSWDIR)\nativdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
notebook.obj: $(MSWDIR)\notebook.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
ownerdrw.obj: $(MSWDIR)\ownerdrw.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
palette.obj: $(MSWDIR)\palette.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
pen.obj: $(MSWDIR)\pen.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
penwin.obj: $(MSWDIR)\penwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
pnghand.obj: $(MSWDIR)\pnghand.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
printdlg.obj: $(MSWDIR)\printdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
printwin.obj: $(MSWDIR)\printwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
radiobox.obj: $(MSWDIR)\radiobox.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
radiobut.obj: $(MSWDIR)\radiobut.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
region.obj: $(MSWDIR)\region.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
registry.obj: $(MSWDIR)\registry.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
regconf.obj: $(MSWDIR)\regconf.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
scrolbar.obj: $(MSWDIR)\scrolbar.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
settings.obj: $(MSWDIR)\settings.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
slidrmsw.obj: $(MSWDIR)\slidrmsw.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
slider95.obj: $(MSWDIR)\slider95.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
spinbutt.obj: $(MSWDIR)\spinbutt.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
statbmp.obj: $(MSWDIR)\statbmp.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
statbox.obj: $(MSWDIR)\statbox.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
statbr95.obj: $(MSWDIR)\statbr95.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
stattext.obj: $(MSWDIR)\stattext.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tabctrl.obj: $(MSWDIR)\tabctrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
taskbar.obj: $(MSWDIR)\taskbar.cpp
cl @<<
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tbar95.obj: $(MSWDIR)\tbar95.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tbarmsw.obj: $(MSWDIR)\tbarmsw.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
textctrl.obj: $(MSWDIR)\textctrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
thread.obj: $(MSWDIR)\thread.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
timer.obj: $(MSWDIR)\timer.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
treectrl.obj: $(MSWDIR)\treectrl.cpp
cl @<<
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
utils.obj: $(MSWDIR)\utils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
utilsexc.obj: $(MSWDIR)\utilsexc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wave.obj: $(MSWDIR)\wave.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
window.obj: $(MSWDIR)\window.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
droptgt.obj: $(OLEDIR)\droptgt.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dropsrc.obj: $(OLEDIR)\dropsrc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dataobj.obj: $(OLEDIR)\dataobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
oleutils.obj: $(OLEDIR)\oleutils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
uuid.obj: $(OLEDIR)\uuid.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
automtn.obj: $(OLEDIR)\automtn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
########################################################
# Common objects (always compiled)
cmndata.obj: $(COMMDIR)\cmndata.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
config.obj: $(COMMDIR)\config.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
db.obj: $(COMMDIR)\db.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dbtable.obj: $(COMMDIR)\dbtable.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
docview.obj: $(COMMDIR)\docview.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
docmdi.obj: $(COMMDIR)\docmdi.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dynarray.obj: $(COMMDIR)\dynarray.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dynlib.obj: $(COMMDIR)\dynlib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
event.obj: $(COMMDIR)\event.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
file.obj: $(COMMDIR)\file.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
fileconf.obj: $(COMMDIR)\fileconf.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
filefn.obj: $(COMMDIR)\filefn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
framecmn.obj: $(COMMDIR)\framecmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gdicmn.obj: $(COMMDIR)\gdicmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
image.obj: $(COMMDIR)\image.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
intl.obj: $(COMMDIR)\intl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
ipcbase.obj: $(COMMDIR)\ipcbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
helpbase.obj: $(COMMDIR)\helpbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
layout.obj: $(COMMDIR)\layout.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
log.obj: $(COMMDIR)\log.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
memory.obj: $(COMMDIR)\memory.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
module.obj: $(COMMDIR)\module.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
object.obj: $(COMMDIR)\object.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
odbc.obj: $(COMMDIR)\odbc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
postscrp.obj: $(COMMDIR)\postcrp.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
prntbase.obj: $(COMMDIR)\prntbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
resource.obj: $(COMMDIR)\resource.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tbarbase.obj: $(COMMDIR)\tbarbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tbarsmpl.obj: $(COMMDIR)\tbarsmpl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
textfile.obj: $(COMMDIR)\textfile.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
timercmn.obj: $(COMMDIR)\timercmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
utilscmn.obj: $(COMMDIR)\utilscmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
validate.obj: $(COMMDIR)\validate.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
valtext.obj: $(COMMDIR)\valtext.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
date.obj: $(COMMDIR)\date.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wxexpr.obj: $(COMMDIR)\wxexpr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
hash.obj: $(COMMDIR)\hash.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
list.obj: $(COMMDIR)\list.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
string.obj: $(COMMDIR)\string.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
socket.obj: $(COMMDIR)\socket.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
sckaddr.obj: $(COMMDIR)\sckaddr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
sckfile.obj: $(COMMDIR)\sckfile.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
sckipc.obj: $(COMMDIR)\sckipc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
sckstrm.obj: $(COMMDIR)\sckstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
url.obj: $(COMMDIR)\url.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
http.obj: $(COMMDIR)\http.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
protocol.obj: $(COMMDIR)\protocol.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tokenzr.obj: $(COMMDIR)\tokenzr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
matrix.obj: $(COMMDIR)\matrix.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
time.obj: $(COMMDIR)\time.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
stream.obj: $(COMMDIR)\stream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wfstream.obj: $(COMMDIR)\wfstream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
mstream.obj: $(COMMDIR)\mstream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
zstream.obj: $(COMMDIR)\zstream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
datstrm.obj: $(COMMDIR)\datstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
objstrm.obj: $(COMMDIR)\objstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
extended.obj: $(COMMDIR)\extended.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
process.obj: $(COMMDIR)\process.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
variant.obj: $(COMMDIR)\variant.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wincmn.obj: $(COMMDIR)\wincmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
*$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
# *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c
$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
########################################################
# Generic objects (not always compiled, depending on
# whether platforms have native implementations)
choicdgg.obj: $(GENDIR)\choicdgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
colrdlgg.obj: $(GENDIR)\colrdgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
fontdlgg.obj: $(GENDIR)\fontdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gridg.obj: $(GENDIR)\gridg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
helpxlp.obj: $(GENDIR)\helpxlp.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
laywin.obj: $(GENDIR)\laywin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
msgdlgg.obj: $(GENDIR)\msgdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
panelg.obj: $(GENDIR)\panelg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
printps.obj: $(GENDIR)\printps.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
prntdlgg.obj: $(GENDIR)\prntdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
sashwin.obj: $(GENDIR)\sashwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
scrolwin.obj: $(GENDIR)\scrolwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
splitter.obj: $(GENDIR)\splitter.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
statusbr.obj: $(GENDIR)\statusbr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tabg.obj: $(GENDIR)\tabg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
textdlgg.obj: $(GENDIR)\textdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
crbuffri.obj: $(XPMDIR)\crbuffri.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
crbuffrp.obj: $(XPMDIR)\crbuffrp.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
crdatfri.obj: $(XPMDIR)\crdatfri.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
crdatfrp.obj: $(XPMDIR)\crdatfrp.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
create.obj: $(XPMDIR)\create.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
crifrbuf.obj: $(XPMDIR)\crifrbuf.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
crifrdat.obj: $(XPMDIR)\crifrdat.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
crpfrdat.obj: $(XPMDIR)\crpfrdat.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
# TODO: what to do about this clash of filename????
#data.obj: $(XPMDIR)\data.c
# *$(CC) $(CPPFLAGS) $(IFLAGS) $<
hashtab.obj: $(XPMDIR)\hashtab.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
misc.obj: $(XPMDIR)\misc.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
parse.obj: $(XPMDIR)\parse.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
rdftodat.obj: $(XPMDIR)\rdftodat.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
rdftoi.obj: $(XPMDIR)\rdftoi.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
rdftop.obj: $(XPMDIR)\rdftop.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
rgb.obj: $(XPMDIR)\rgb.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
scan.obj: $(XPMDIR)\scan.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
simx.obj: $(XPMDIR)\simx.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
wrffrdat.obj: $(XPMDIR)\wrffrdat.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
wrffri.obj: $(XPMDIR)\wrffri.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
wrffrp.obj: $(XPMDIR)\wrffrp.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
#wxxpm: .SYMBOLIC
# cd $(WXDIR)\contrib\wxxpm
# wmake -f makefile.wat all
# cd $(WXDIR)\src\msw
#clean_wxxpm: .SYMBOLIC
# cd $(WXDIR)\contrib\wxxpm
# wmake -f makefile.wat clean
# cd $(WXDIR)\src\msw
clean_wxstring: .SYMBOLIC
cd $(WXDIR)\contrib\wxstring
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
clean_rcp: .SYMBOLIC
cd $(WXDIR)\utils\rcparser\src
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw

11
src/msw/ole/automtn.cpp
View File

@ -163,8 +163,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
for (i = 0; i < noArgs; i++)
{
// Again, reverse args
wxVariant& theVariant = INVOKEARG((noArgs-1) - i);
if (!ConvertVariantToOle(theVariant, oleArgs[i]))
if (!ConvertVariantToOle(INVOKEARG((noArgs-1) - i), oleArgs[i]))
return FALSE; // TODO: clean up memory at this point
}
@ -509,7 +508,11 @@ bool wxAutomationObject::ConvertVariantToOle(const wxVariant& variant, VARIANTAR
else if (type == "bool")
{
oleVariant.vt = VT_BOOL;
#ifdef __WATCOMC__
oleVariant.bool = variant.GetBool();
#else
oleVariant.boolVal = variant.GetBool();
#endif
}
else if (type == "string")
{
@ -633,7 +636,11 @@ bool wxAutomationObject::ConvertOleToVariant(const VARIANTARG& oleVariant, wxVar
case VT_BOOL:
{
#ifdef __WATCOMC__
variant = (bool) (oleVariant.bool != 0);
#else
variant = (bool) (oleVariant.boolVal != 0);
#endif
break;
}
case VT_R8:

1486
wxinstall Normal file
View File

File diff suppressed because it is too large Load Diff