NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
OS2TEMPTGT2=$(WXDIR)\lib\wxos22.lib
+HTMLTEMPTGT=$(WXDIR)\lib\wxhtml.lib
DUMMYOBJ=$D\dummy.obj
!endif
OS2DIR=$(WXDIR)\src\os2
HTMLDIR = $(WXDIR)\src\html
+!if [md $(COMMDIR)\$D]
+!endif
+
+!if [md $(OS2DIR)\$D]
+!endif
+
+!if [md $(GENDIR)\$D]
+!endif
+
+!if [md $(HTMLDIR)\$D]
+!endif
+
{..\generic}.cpp{..\generic\$D}.obj:
@echo $<
icc @<<
..\generic\$D\statusbr.obj \
..\generic\$D\tabg.obj \
..\generic\$D\textdlgg.obj \
- ..\generic\$D\treectrl.obj \
- ..\generic\$D\tipdlg.obj
+ ..\generic\$D\tipdlg.obj \
+ ..\generic\$D\treectrl.obj
# ..\generic\$D\gridg.obj \
# ..\generic\$D\notebook.obj \
statusbr.obj \
tabg.obj \
textdlgg.obj \
- treectrl.obj \
- tipdlg.obj
+ tipdlg.obj \
+ treectrl.obj
# These are generic things that don't need to be compiled on PM,
# but sometimes it's useful to do so for testing purposes.
..\common\$D\longlong.obj \
..\common\$D\matrix.obj \
..\common\$D\memory.obj \
+ ..\common\$D\menucmn.obj \
..\common\$D\mimetype.obj \
..\common\$D\module.obj \
..\common\$D\mstream.obj \
..\common\$D\object.obj \
..\common\$D\objstrm.obj \
- ..\common\$D\odbc.obj \
..\common\$D\paper.obj \
..\common\$D\prntbase.obj \
..\common\$D\process.obj \
longlong.obj \
matrix.obj \
memory.obj \
+ menucmn.obj \
mimetype.obj \
module.obj \
mstream.obj \
object.obj \
objstrm.obj \
- odbc.obj \
paper.obj \
prntbase.obj \
process.obj \
..\os2\$D\frame.obj \
..\os2\$D\gauge.obj \
..\os2\$D\gdiobj.obj \
+ ..\os2\$D\gdiimage.obj \
..\os2\$D\gsocket.obj \
..\os2\$D\helpwin.obj \
..\os2\$D\icon.obj \
fontdlg.obj \
frame.obj \
gauge.obj \
+ gdiimage.obj \
gdiobj.obj \
gsocket.obj \
helpwin.obj \
metafile.obj \
minifram.obj \
msgdlg.obj \
- nativdlg.obj \
- notebook.obj
+ nativdlg.obj
OS2LIBOBJS2 = \
+ notebook.obj \
ownerdrw.obj \
palette.obj \
pen.obj \
textctrl.obj \
thread.obj \
timer.obj \
-# toolbar.obj \
+ toolbar.obj \
tooltip.obj \
utils.obj \
utilsexc.obj \
window.obj
HTMLOBJS = \
+ ..\html\$D\helpctrl.obj \
+ ..\html\$D\helpdata.obj \
+ ..\html\$D\helpfrm.obj \
..\html\$D\htmlcell.obj \
- ..\html\$D\htmlfilter.obj \
- ..\html\$D\htmlhelp.obj \
- ..\html\$D\htmlhelp_io.obj \
- ..\html\$D\htmlparser.obj \
+ ..\html\$D\htmlfilt.obj \
+ ..\html\$D\htmlpars.obj \
..\html\$D\htmltag.obj \
..\html\$D\htmlwin.obj \
- ..\html\$D\htmlwinparser.obj \
- ..\html\$D\mod_fonts.obj \
- ..\html\$D\mod_hline.obj \
- ..\html\$D\mod_image.obj \
- ..\html\$D\mod_layout.obj \
- ..\html\$D\mod_links.obj \
- ..\html\$D\mod_list.obj \
- ..\html\$D\mod_pre.obj \
- ..\html\$D\mod_tables.obj \
- ..\html\$D\search.obj
+ ..\html\$D\htmprint.obj \
+ ..\html\$D\m_fonts.obj \
+ ..\html\$D\m_hline.obj \
+ ..\html\$D\m_image.obj \
+ ..\html\$D\m_layout.obj \
+ ..\html\$D\m_links.obj \
+ ..\html\$D\m_list.obj \
+ ..\html\$D\m_pre.obj \
+ ..\html\$D\m_tables.obj \
+ ..\html\$D\winpars.obj
+
+HTMLLIBOBJS = \
+ helpctrl.obj \
+ helpdata.obj \
+ helpfrm.obj \
+ htmlcell.obj \
+ htmlfilt.obj \
+ htmlpars.obj \
+ htmltag.obj \
+ htmlwin.obj \
+ htmprint.obj \
+ m_fonts.obj \
+ m_hline.obj \
+ m_image.obj \
+ m_layout.obj \
+ m_links.obj \
+ m_list.obj \
+ m_pre.obj \
+ m_tables.obj \
+ winpars.obj
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
# Normal, static library
-all: $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+all: $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
test: $(OS2DIR)\$D\wave.obj
test2: ..\common\Debug\config.obj
-$D:
- md $D
-
-$(COMMDIR)\$D:
- md $(COMMDIR)\$D
-
-$(OS2DIR)\$D:
- md $(OS2DIR)\$D
-
-$(GENDIR)\$D:
- md $(GENDIR)\$D
-
-$(HTMLDIR)\$D:
- md $(HTMLDIR)\$D
-
$(COMLIBOBJS1):
copy ..\common\$D\appcmn.obj
copy ..\common\$D\choiccmn.obj
copy ..\common\$D\longlong.obj
copy ..\common\$D\matrix.obj
copy ..\common\$D\memory.obj
+ copy ..\common\$D\menucmn.obj
copy ..\common\$D\mimetype.obj
copy ..\common\$D\module.obj
copy ..\common\$D\mstream.obj
copy ..\common\$D\object.obj
copy ..\common\$D\objstrm.obj
- copy ..\common\$D\odbc.obj
copy ..\common\$D\paper.obj
copy ..\common\$D\prntbase.obj
copy ..\common\$D\process.obj
copy ..\common\$D\valgen.obj
copy ..\common\$D\validate.obj
copy ..\common\$D\valtext.obj
- copy ..\common\$D\variant.obj
$(COMLIBOBJS3):
+ copy ..\common\$D\variant.obj
copy ..\common\$D\wfstream.obj
copy ..\common\$D\wincmn.obj
copy ..\common\$D\wxchar.obj
copy ..\generic\$D\statusbr.obj
copy ..\generic\$D\tabg.obj
copy ..\generic\$D\textdlgg.obj
- copy ..\generic\$D\treectrl.obj
copy ..\generic\$D\tipdlg.obj
+ copy ..\generic\$D\treectrl.obj
+
+$(HTMLLIBOBJS):
+ copy ..\html\$D\helpctrl.obj
+ copy ..\html\$D\helpdata.obj
+ copy ..\html\$D\helpfrm.obj
+ copy ..\html\$D\htmlcell.obj
+ copy ..\html\$D\htmlfilt.obj
+ copy ..\html\$D\htmlpars.obj
+ copy ..\html\$D\htmltag.obj
+ copy ..\html\$D\htmlwin.obj
+ copy ..\html\$D\htmprint.obj
+ copy ..\html\$D\m_fonts.obj
+ copy ..\html\$D\m_hline.obj
+ copy ..\html\$D\m_image.obj
+ copy ..\html\$D\m_layout.obj
+ copy ..\html\$D\m_links.obj
+ copy ..\html\$D\m_list.obj
+ copy ..\html\$D\m_pre.obj
+ copy ..\html\$D\m_tables.obj
+ copy ..\html\$D\winpars.obj
$(OS2LIBOBJS1):
copy ..\os2\$D\accel.obj
copy ..\os2\$D\fontdlg.obj
copy ..\os2\$D\frame.obj
copy ..\os2\$D\gauge.obj
+ copy ..\os2\$D\gdiimage.obj
copy ..\os2\$D\gdiobj.obj
copy ..\os2\$D\gsocket.obj
copy ..\os2\$D\helpwin.obj
copy ..\os2\$D\minifram.obj
copy ..\os2\$D\msgdlg.obj
copy ..\os2\$D\nativdlg.obj
- copy ..\os2\$D\notebook.obj
$(OS2LIBOBJS2):
+ copy ..\os2\$D\notebook.obj
copy ..\os2\$D\ownerdrw.obj
copy ..\os2\$D\palette.obj
copy ..\os2\$D\pen.obj
copy ..\os2\$D\textctrl.obj
copy ..\os2\$D\thread.obj
copy ..\os2\$D\timer.obj
-# copy ..\os2\$D\toolbar.obj
+ copy ..\os2\$D\toolbar.obj
copy ..\os2\$D\tooltip.obj
copy ..\os2\$D\utils.obj
copy ..\os2\$D\utilsexc.obj
$**;
<<
+$(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS)
+ touch $(WXDIR)\lib\wxhtml.lib
+ del $(WXDIR)\lib\wxhtml.lib
+ ilib $(LIBFLAGS) $@ @<<
+ $**;
+<<
+
$(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
touch $(WXDIR)\lib\wxnones.lib
del $(WXDIR)\lib\wxnones.lib
$(COMTEMPTGT2) \
$(COMTEMPTGT3) \
$(GENTEMPTGT) \
+ $(HTMLTEMPTGT) \
$(NONESTEMPTGT) \
$(OS2TEMPTGT1) \
$(OS2TEMPTGT2) \
del $(COMTEMPTGT2)
del $(COMTEMPTGT3)
del $(GENTEMPTGT)
+ del $(HTMLTEMPTGT)
del $(NONESTEMPTGT)
del $(OS2TEMPTGT1)
del $(OS2TEMPTGT2)
$(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c
<<
+png:
+ cd $(WXDIR)\src\png
+ nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ cd $(WXDIR)\src\os2
+
+clean_png:
+ cd $(WXDIR)\src\png
+ nmake -f makefile.va clean
+ cd $(WXDIR)\src\os2
+
+zlib:
+ cd $(WXDIR)\src\zlib
+ nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ cd $(WXDIR)\src\os2
+
+clean_zlib:
+ cd $(WXDIR)\src\zlib
+ nmake -f makefile.va clean
+ cd $(WXDIR)\src\os2
+
+jpeg:
+ cd $(WXDIR)\src\jpeg
+ nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ cd $(WXDIR)\src\os2
+
+clean_jpeg:
+ cd $(WXDIR)\src\jpeg
+ nmake -f makefile.va clean
+ cd $(WXDIR)\src\os2
+
+xpm:
+ cd $(WXDIR)\src\xpm
+ nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ cd $(WXDIR)\src\os2
+
+clean_xpm:
+ cd $(WXDIR)\src\xpm
+ nmake -f makefile.va clean
+ cd $(WXDIR)\src\os2
+
clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
- -erase $(LIBTARGET)
- -erase ..\..\lib\wx200.dll
- -erase ..\..\lib\wx200.lib
- -erase $(GENDIR)\$D\*.obj
- -erase $(COMMDIR)\$D\*.obj
- -erase $(COMMDIR)\\y_tab.c
- -erase $(COMMDIR)\lex_yy.c
- -erase $(OS2DIR)\$D\*.obj
- -rmdir $(D)
- -rmdir ole\$(D)
- -rmdir ..\generic\$(D)
- -rmdir ..\common\$(D)
+ del $(LIBTARGET)
+ erase /N ..\..\lib\wx200.dll
+ erase /N ..\..\lib\wx200.lib
+ erase /N $(GENDIR)\$D\*.obj
+ erase /N $(COMMDIR)\$D\*.obj
+ erase /N $(COMMDIR)\\y_tab.c
+ erase /N $(COMMDIR)\lex_yy.c
+ erase /N $(OS2DIR)\$D\*.obj
+ rd $(D)
+ rd ..\generic\$(D)
+ rd ..\common\$(D)
+ rd ..\html\$(D)
+ rd ..\os2\$(D)
cleanall: clean
projects / wxWidgets.git / blobdiff