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

applied patch #432997 (wxHTML added to Watcom makefiles)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2001-06-18 22:37:42 +00:00
parent 17665a2b5c
commit 17092e43e5
2 changed files with 127 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,13 @@
$file =~ s/cp?p?$/obj/;
$project{$tag} .= $file . " "
}
foreach $file (sort keys %wxHTML) {
next if $wxHTML{$file} =~ /\b16\b/;
$file =~ s/cp?p?$/obj/;
$project{"WXHTMLOBJS"} .= $file . " "
}
foreach $file (sort keys %wxCommon) {
$isCFile = $file =~ /\.c$/;
@ -90,6 +97,7 @@ JPEGDIR=$(WXDIR)\src\jpeg
TIFFDIR=$(WXDIR)\src\tiff
MSWDIR=$(WXDIR)\src\msw
OLEDIR=$(MSWDIR)\ole
HTMLDIR=$(WXDIR)\src\html
DOCDIR = $(WXDIR)\docs
@ -105,10 +113,12 @@ COMMONOBJS = &
MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@ -206,6 +216,23 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
}
#$}
########################################################
# HTML objects (always compiled)
#${
$_ = $project{"WXHTMLOBJS"};
my @objs = split;
foreach (@objs) {
$text .= $_;
s/\.obj$//;
$text .= ': $(HTMLDIR)\\';
$text .= $_ . ".cpp\n" .
' *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
}
#$}
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) \

101
src/msw/makefile.wat
View File

@ -1,6 +1,6 @@
#!/binb/wmake.exe
# This file was automatically generated by tmake at 01:55, 2001/06/09
# This file was automatically generated by tmake at 13:07, 2001/06/18
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
@ -37,6 +37,7 @@ JPEGDIR=$(WXDIR)\src\jpeg
TIFFDIR=$(WXDIR)\src\tiff
MSWDIR=$(WXDIR)\src\msw
OLEDIR=$(MSWDIR)\ole
HTMLDIR=$(WXDIR)\src\html
DOCDIR = $(WXDIR)\docs
@ -105,6 +106,7 @@ COMMONOBJS = &
datetime.obj &
datstrm.obj &
db.obj &
dbgrid.obj &
dbtable.obj &
dcbase.obj &
dircmn.obj &
@ -309,10 +311,31 @@ MSWOBJS = accel.obj &
wave.obj &
window.obj
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
HTMLOBJS = helpctrl.obj &
helpdata.obj &
helpfrm.obj &
htmlcell.obj &
htmlfilt.obj &
htmlpars.obj &
htmltag.obj &
htmlwin.obj &
htmprint.obj &
m_dflist.obj &
m_fonts.obj &
m_hline.obj &
m_image.obj &
m_layout.obj &
m_links.obj &
m_list.obj &
m_meta.obj &
m_pre.obj &
m_tables.obj &
winpars.obj
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@ -693,6 +716,9 @@ datstrm.obj: $(COMMDIR)\datstrm.cpp
db.obj: $(COMMDIR)\db.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dbgrid.obj: $(COMMDIR)\dbgrid.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dbtable.obj: $(COMMDIR)\dbtable.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -1084,6 +1110,73 @@ wizard.obj: $(GENDIR)\wizard.cpp
########################################################
# HTML objects (always compiled)
helpctrl.obj: $(HTMLDIR)\helpctrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
helpdata.obj: $(HTMLDIR)\helpdata.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
helpfrm.obj: $(HTMLDIR)\helpfrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
htmlcell.obj: $(HTMLDIR)\htmlcell.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
htmlfilt.obj: $(HTMLDIR)\htmlfilt.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
htmlpars.obj: $(HTMLDIR)\htmlpars.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
htmltag.obj: $(HTMLDIR)\htmltag.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
htmlwin.obj: $(HTMLDIR)\htmlwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
htmprint.obj: $(HTMLDIR)\htmprint.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_dflist.obj: $(HTMLDIR)\m_dflist.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_fonts.obj: $(HTMLDIR)\m_fonts.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_hline.obj: $(HTMLDIR)\m_hline.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_image.obj: $(HTMLDIR)\m_image.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_layout.obj: $(HTMLDIR)\m_layout.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_links.obj: $(HTMLDIR)\m_links.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_list.obj: $(HTMLDIR)\m_list.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_meta.obj: $(HTMLDIR)\m_meta.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_pre.obj: $(HTMLDIR)\m_pre.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
m_tables.obj: $(HTMLDIR)\m_tables.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
winpars.obj: $(HTMLDIR)\winpars.cpp
*$(CCC) $(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) \