projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple demo tweaks
[wxWidgets.git]
/
src
/
mgl
/
makefile.wat
diff --git
a/src/mgl/makefile.wat
b/src/mgl/makefile.wat
index c7ae6293cd76b37c5ebe555b08fe1f50da038284..e430120e81cf40624618ad0a20918c926807fc4b 100644
(file)
--- a/
src/mgl/makefile.wat
+++ b/
src/mgl/makefile.wat
@@
-1,6
+1,6
@@
#!/binb/wmake.exe
#!/binb/wmake.exe
-# This file was automatically generated by tmake
at 16:22, 2001/12/09
+# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
@@
-46,6
+46,7
@@
GENERICOBJS= accel.obj &
caret.obj &
choicdgg.obj &
colrdlgg.obj &
caret.obj &
choicdgg.obj &
colrdlgg.obj &
+ dcbuffer.obj &
dcpsg.obj &
dirctrlg.obj &
dirdlgg.obj &
dcpsg.obj &
dirctrlg.obj &
dirdlgg.obj &
@@
-58,7
+59,6
@@
GENERICOBJS= accel.obj &
gridsel.obj &
helpext.obj &
helphtml.obj &
gridsel.obj &
helpext.obj &
helphtml.obj &
- helpwxht.obj &
imaglist.obj &
laywin.obj &
listctrl.obj &
imaglist.obj &
laywin.obj &
listctrl.obj &
@@
-80,6
+80,7
@@
GENERICOBJS= accel.obj &
tabg.obj &
tbarsmpl.obj &
textdlgg.obj &
tabg.obj &
tbarsmpl.obj &
textdlgg.obj &
+ timer.obj &
tipdlg.obj &
tipwin.obj &
treectlg.obj &
tipdlg.obj &
tipwin.obj &
treectlg.obj &
@@
-89,6
+90,9
@@
GENERICOBJS= accel.obj &
COMMONOBJS = &
y_tab.obj &
appcmn.obj &
COMMONOBJS = &
y_tab.obj &
appcmn.obj &
+ artprov.obj &
+ artstd.obj &
+ bmpbase.obj &
choiccmn.obj &
clipcmn.obj &
clntdata.obj &
choiccmn.obj &
clipcmn.obj &
clntdata.obj &
@@
-115,6
+119,7
@@
COMMONOBJS = &
dseldlg.obj &
dynarray.obj &
dynlib.obj &
dseldlg.obj &
dynarray.obj &
dynlib.obj &
+ dynload.obj &
effects.obj &
encconv.obj &
event.obj &
effects.obj &
encconv.obj &
event.obj &
@@
-138,12
+143,16
@@
COMMONOBJS = &
geometry.obj &
gifdecod.obj &
hash.obj &
geometry.obj &
gifdecod.obj &
hash.obj &
+ hashmap.obj &
helpbase.obj &
http.obj &
helpbase.obj &
http.obj &
+ iconbndl.obj &
imagall.obj &
imagbmp.obj &
image.obj &
imagall.obj &
imagbmp.obj &
image.obj &
+ imagfill.obj &
imaggif.obj &
imaggif.obj &
+ imagiff.obj &
imagjpeg.obj &
imagpcx.obj &
imagpng.obj &
imagjpeg.obj &
imagpcx.obj &
imagpng.obj &
@@
-165,7
+174,6
@@
COMMONOBJS = &
mstream.obj &
nbkbase.obj &
object.obj &
mstream.obj &
nbkbase.obj &
object.obj &
- objstrm.obj &
odbc.obj &
paper.obj &
popupcmn.obj &
odbc.obj &
paper.obj &
popupcmn.obj &
@@
-180,7
+188,6
@@
COMMONOBJS = &
sckfile.obj &
sckipc.obj &
sckstrm.obj &
sckfile.obj &
sckipc.obj &
sckstrm.obj &
- serbase.obj &
sizer.obj &
socket.obj &
statbar.obj &
sizer.obj &
socket.obj &
statbar.obj &
@@
-210,8
+217,7
@@
COMMONOBJS = &
wxexpr.obj &
xpmdecod.obj &
zipstrm.obj &
wxexpr.obj &
xpmdecod.obj &
zipstrm.obj &
- zstream.obj &
- bmpbase.obj
+ zstream.obj
MGLOBJS = app.obj &
bitmap.obj &
MGLOBJS = app.obj &
bitmap.obj &
@@
-224,15
+230,17
@@
MGLOBJS = app.obj &
dcclient.obj &
dcmemory.obj &
dcscreen.obj &
dcclient.obj &
dcmemory.obj &
dcscreen.obj &
+ dirmgl.obj &
evtloop.obj &
font.obj &
evtloop.obj &
font.obj &
+ fontenum.obj &
+ fontutil.obj &
gdiobj.obj &
icon.obj &
palette.obj &
pen.obj &
region.obj &
settings.obj &
gdiobj.obj &
icon.obj &
palette.obj &
pen.obj &
region.obj &
settings.obj &
- timer.obj &
toplevel.obj &
utils.obj &
window.obj
toplevel.obj &
utils.obj &
window.obj
@@
-268,10
+276,12
@@
UNIVOBJS = bmpbuttn.obj &
statusbr.obj &
textctrl.obj &
theme.obj &
statusbr.obj &
textctrl.obj &
theme.obj &
+ toolbar.obj &
topluniv.obj &
winuniv.obj
UNIVTHEMEOBJS = gtk.obj &
topluniv.obj &
winuniv.obj
UNIVTHEMEOBJS = gtk.obj &
+ metal.obj &
win32.obj
HTMLOBJS = helpctrl.obj &
win32.obj
HTMLOBJS = helpctrl.obj &
@@
-292,13
+302,23
@@
HTMLOBJS = helpctrl.obj &
m_list.obj &
m_meta.obj &
m_pre.obj &
m_list.obj &
m_meta.obj &
m_pre.obj &
+ m_style.obj &
m_tables.obj &
winpars.obj
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
m_tables.obj &
winpars.obj
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
-all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all: $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+
+$(ARCHINCDIR)\wx:
+ mkdir $(ARCHINCDIR)
+ mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+ copy $(WXDIR)\include\wx\univ\setup.h $@
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@@
-347,12
+367,21
@@
dcmemory.obj: $(MGLDIR)\dcmemory.cpp
dcscreen.obj: $(MGLDIR)\dcscreen.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dcscreen.obj: $(MGLDIR)\dcscreen.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+dirmgl.obj: $(MGLDIR)\dirmgl.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
evtloop.obj: $(MGLDIR)\evtloop.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
font.obj: $(MGLDIR)\font.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
evtloop.obj: $(MGLDIR)\evtloop.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
font.obj: $(MGLDIR)\font.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+fontenum.obj: $(MGLDIR)\fontenum.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontutil.obj: $(MGLDIR)\fontutil.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
gdiobj.obj: $(MGLDIR)\gdiobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gdiobj.obj: $(MGLDIR)\gdiobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-371,9
+400,6
@@
region.obj: $(MGLDIR)\region.cpp
settings.obj: $(MGLDIR)\settings.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
settings.obj: $(MGLDIR)\settings.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-timer.obj: $(MGLDIR)\timer.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
toplevel.obj: $(MGLDIR)\toplevel.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
toplevel.obj: $(MGLDIR)\toplevel.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-481,6
+507,9
@@
textctrl.obj: $(UNIVDIR)\textctrl.cpp
theme.obj: $(UNIVDIR)\theme.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
theme.obj: $(UNIVDIR)\theme.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+toolbar.obj: $(UNIVDIR)\toolbar.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
topluniv.obj: $(UNIVDIR)\topluniv.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
topluniv.obj: $(UNIVDIR)\topluniv.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-492,6
+521,9
@@
winuniv.obj: $(UNIVDIR)\winuniv.cpp
gtk.obj: $(UNIVTHEMEDIR)\gtk.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gtk.obj: $(UNIVTHEMEDIR)\gtk.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+metal.obj: $(UNIVTHEMEDIR)\metal.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
win32.obj: $(UNIVTHEMEDIR)\win32.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
win32.obj: $(UNIVTHEMEDIR)\win32.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-503,6
+535,15
@@
win32.obj: $(UNIVTHEMEDIR)\win32.cpp
appcmn.obj: $(COMMDIR)\appcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
appcmn.obj: $(COMMDIR)\appcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+artprov.obj: $(COMMDIR)\artprov.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+artstd.obj: $(COMMDIR)\artstd.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+bmpbase.obj: $(COMMDIR)\bmpbase.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
choiccmn.obj: $(COMMDIR)\choiccmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
choiccmn.obj: $(COMMDIR)\choiccmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-581,6
+622,9
@@
dynarray.obj: $(COMMDIR)\dynarray.cpp
dynlib.obj: $(COMMDIR)\dynlib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dynlib.obj: $(COMMDIR)\dynlib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+dynload.obj: $(COMMDIR)\dynload.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
effects.obj: $(COMMDIR)\effects.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
effects.obj: $(COMMDIR)\effects.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-650,12
+694,18
@@
gifdecod.obj: $(COMMDIR)\gifdecod.cpp
hash.obj: $(COMMDIR)\hash.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
hash.obj: $(COMMDIR)\hash.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+hashmap.obj: $(COMMDIR)\hashmap.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
helpbase.obj: $(COMMDIR)\helpbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
http.obj: $(COMMDIR)\http.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
helpbase.obj: $(COMMDIR)\helpbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
http.obj: $(COMMDIR)\http.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+iconbndl.obj: $(COMMDIR)\iconbndl.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
imagall.obj: $(COMMDIR)\imagall.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imagall.obj: $(COMMDIR)\imagall.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-665,9
+715,15
@@
imagbmp.obj: $(COMMDIR)\imagbmp.cpp
image.obj: $(COMMDIR)\image.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
image.obj: $(COMMDIR)\image.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+imagfill.obj: $(COMMDIR)\imagfill.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
imaggif.obj: $(COMMDIR)\imaggif.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imaggif.obj: $(COMMDIR)\imaggif.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+imagiff.obj: $(COMMDIR)\imagiff.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
imagjpeg.obj: $(COMMDIR)\imagjpeg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imagjpeg.obj: $(COMMDIR)\imagjpeg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-731,9
+787,6
@@
nbkbase.obj: $(COMMDIR)\nbkbase.cpp
object.obj: $(COMMDIR)\object.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
object.obj: $(COMMDIR)\object.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-objstrm.obj: $(COMMDIR)\objstrm.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
odbc.obj: $(COMMDIR)\odbc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
odbc.obj: $(COMMDIR)\odbc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-776,9
+829,6
@@
sckipc.obj: $(COMMDIR)\sckipc.cpp
sckstrm.obj: $(COMMDIR)\sckstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
sckstrm.obj: $(COMMDIR)\sckstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-serbase.obj: $(COMMDIR)\serbase.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
sizer.obj: $(COMMDIR)\sizer.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
sizer.obj: $(COMMDIR)\sizer.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-869,9
+919,6
@@
zipstrm.obj: $(COMMDIR)\zipstrm.cpp
zstream.obj: $(COMMDIR)\zstream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
zstream.obj: $(COMMDIR)\zstream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-bmpbase.obj: $(COMMDIR)\bmpbase.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
@@
-907,6
+954,9
@@
choicdgg.obj: $(GENDIR)\choicdgg.cpp
colrdlgg.obj: $(GENDIR)\colrdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
colrdlgg.obj: $(GENDIR)\colrdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+dcbuffer.obj: $(GENDIR)\dcbuffer.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
dcpsg.obj: $(GENDIR)\dcpsg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dcpsg.obj: $(GENDIR)\dcpsg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-943,9
+993,6
@@
helpext.obj: $(GENDIR)\helpext.cpp
helphtml.obj: $(GENDIR)\helphtml.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
helphtml.obj: $(GENDIR)\helphtml.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-helpwxht.obj: $(GENDIR)\helpwxht.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
imaglist.obj: $(GENDIR)\imaglist.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imaglist.obj: $(GENDIR)\imaglist.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-1009,6
+1056,9
@@
tbarsmpl.obj: $(GENDIR)\tbarsmpl.cpp
textdlgg.obj: $(GENDIR)\textdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
textdlgg.obj: $(GENDIR)\textdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+timer.obj: $(GENDIR)\timer.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
tipdlg.obj: $(GENDIR)\tipdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tipdlg.obj: $(GENDIR)\tipdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@
-1084,6
+1134,9
@@
m_meta.obj: $(HTMLDIR)\m_meta.cpp
m_pre.obj: $(HTMLDIR)\m_pre.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_pre.obj: $(HTMLDIR)\m_pre.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+m_style.obj: $(HTMLDIR)\m_style.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
m_tables.obj: $(HTMLDIR)\m_tables.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_tables.obj: $(HTMLDIR)\m_tables.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<