X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6ebb51430cd8e4a9a11c6c5a5ca7c3ff9d7a72a..0413cec5271566470f4c852608a35800b49056cd:/src/os2/makefile.va diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 9246affb46..f2f4de5011 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -29,6 +29,7 @@ GENTEMPTGT=$(WXDIR)\lib\wxgen.lib 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 @@ -51,6 +52,18 @@ COMMDIR=$(WXDIR)\src\common 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 @<< @@ -88,7 +101,6 @@ GENERICOBJS= \ ..\generic\$D\colrdlgg.obj \ ..\generic\$D\dcpsg.obj \ ..\generic\$D\grid.obj \ - ..\generic\$D\gridg.obj \ ..\generic\$D\helpext.obj \ ..\generic\$D\helphtml.obj \ ..\generic\$D\helpwxht.obj \ @@ -111,9 +123,10 @@ GENERICOBJS= \ ..\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 \ GENLIBOBJS= \ @@ -123,7 +136,6 @@ GENLIBOBJS= \ colrdlgg.obj \ dcpsg.obj \ grid.obj \ - gridg.obj \ helpext.obj \ helphtml.obj \ helpwxht.obj \ @@ -146,8 +158,8 @@ GENLIBOBJS= \ 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. @@ -163,7 +175,7 @@ COMMONOBJS = \ ..\common\$D\config.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ - ..\common\$D\date.obj \ + ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ ..\common\$D\db.obj \ ..\common\$D\dbtable.obj \ @@ -174,6 +186,7 @@ COMMONOBJS = \ ..\common\$D\docview.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ ..\common\$D\ffile.obj \ @@ -182,6 +195,7 @@ COMMONOBJS = \ ..\common\$D\filefn.obj \ ..\common\$D\filesys.obj \ ..\common\$D\fontcmn.obj \ + ..\common\$D\fontmap.obj \ ..\common\$D\framecmn.obj \ ..\common\$D\fs_inet.obj \ ..\common\$D\fs_zip.obj \ @@ -208,12 +222,12 @@ COMMONOBJS = \ ..\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 \ @@ -230,10 +244,8 @@ COMMONOBJS = \ ..\common\$D\stream.obj \ ..\common\$D\string.obj \ ..\common\$D\tbarbase.obj \ - ..\common\$D\tbarsmpl.obj \ ..\common\$D\textcmn.obj \ ..\common\$D\textfile.obj \ - ..\common\$D\time.obj \ ..\common\$D\timercmn.obj \ ..\common\$D\tokenzr.obj \ ..\common\$D\txtstrm.obj \ @@ -260,7 +272,7 @@ COMLIBOBJS1 = \ config.obj \ ctrlcmn.obj \ ctrlsub.obj \ - date.obj \ + datetime.obj \ datstrm.obj \ db.obj \ dbtable.obj \ @@ -271,6 +283,7 @@ COMLIBOBJS1 = \ docview.obj \ dynarray.obj \ dynlib.obj \ + encconv.obj \ event.obj \ extended.obj \ ffile.obj \ @@ -279,6 +292,7 @@ COMLIBOBJS1 = \ filefn.obj \ filesys.obj \ fontcmn.obj \ + fontmap.obj \ framecmn.obj \ fs_inet.obj \ fs_zip.obj \ @@ -294,11 +308,11 @@ COMLIBOBJS1 = \ imaggif.obj \ imagjpeg.obj \ imagpcx.obj \ - imagpng.obj \ - imagpnm.obj \ - intl.obj + imagpng.obj COMLIBOBJS2 = \ + imagpnm.obj \ + intl.obj \ ipcbase.obj \ layout.obj \ lboxcmn.obj \ @@ -307,12 +321,12 @@ COMLIBOBJS2 = \ 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 \ @@ -329,10 +343,8 @@ COMLIBOBJS2 = \ stream.obj \ string.obj \ tbarbase.obj \ - tbarsmpl.obj \ textcmn.obj \ textfile.obj \ - time.obj \ timercmn.obj \ tokenzr.obj \ txtstrm.obj \ @@ -340,10 +352,10 @@ COMLIBOBJS2 = \ url.obj \ utilscmn.obj \ valgen.obj \ - validate.obj \ - valtext.obj + validate.obj COMLIBOBJS3 = \ + valtext.obj \ variant.obj \ wfstream.obj \ wincmn.obj \ @@ -381,9 +393,12 @@ OS2OBJS = \ ..\os2\$D\filedlg.obj \ ..\os2\$D\font.obj \ ..\os2\$D\fontdlg.obj \ + ..\os2\$D\fontenum.obj \ + ..\os2\$D\fontutil.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 \ @@ -456,26 +471,27 @@ OS2LIBOBJS1 = \ filedlg.obj \ font.obj \ fontdlg.obj \ + fontenum.obj \ + fontutil.obj \ frame.obj \ gauge.obj \ + gdiimage.obj \ gdiobj.obj \ gsocket.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 + minifram.obj OS2LIBOBJS2 = \ + msgdlg.obj \ nativdlg.obj \ notebook.obj \ ownerdrw.obj \ @@ -495,7 +511,6 @@ OS2LIBOBJS2 = \ statbox.obj \ stattext.obj \ statline.obj \ - statbrpm.obj \ tabctrl.obj \ taskbar.obj \ textctrl.obj \ @@ -503,36 +518,56 @@ OS2LIBOBJS2 = \ timer.obj \ toolbar.obj \ tooltip.obj \ - treectrl.obj \ utils.obj \ utilsexc.obj \ wave.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 @@ -540,21 +575,6 @@ 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 @@ -563,7 +583,7 @@ $(COMLIBOBJS1): copy ..\common\$D\config.obj copy ..\common\$D\ctrlcmn.obj copy ..\common\$D\ctrlsub.obj - copy ..\common\$D\date.obj + copy ..\common\$D\datetime.obj copy ..\common\$D\datstrm.obj copy ..\common\$D\db.obj copy ..\common\$D\dbtable.obj @@ -574,6 +594,7 @@ $(COMLIBOBJS1): copy ..\common\$D\docview.obj copy ..\common\$D\dynarray.obj copy ..\common\$D\dynlib.obj + copy ..\common\$D\encconv.obj copy ..\common\$D\event.obj copy ..\common\$D\extended.obj copy ..\common\$D\ffile.obj @@ -582,6 +603,7 @@ $(COMLIBOBJS1): copy ..\common\$D\filefn.obj copy ..\common\$D\filesys.obj copy ..\common\$D\fontcmn.obj + copy ..\common\$D\fontmap.obj copy ..\common\$D\framecmn.obj copy ..\common\$D\fs_inet.obj copy ..\common\$D\fs_zip.obj @@ -598,10 +620,10 @@ $(COMLIBOBJS1): copy ..\common\$D\imagjpeg.obj copy ..\common\$D\imagpcx.obj copy ..\common\$D\imagpng.obj - copy ..\common\$D\imagpnm.obj - copy ..\common\$D\intl.obj $(COMLIBOBJS2): + copy ..\common\$D\imagpnm.obj + copy ..\common\$D\intl.obj copy ..\common\$D\ipcbase.obj copy ..\common\$D\layout.obj copy ..\common\$D\lboxcmn.obj @@ -610,12 +632,12 @@ $(COMLIBOBJS2): 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 @@ -632,10 +654,8 @@ $(COMLIBOBJS2): copy ..\common\$D\stream.obj copy ..\common\$D\string.obj copy ..\common\$D\tbarbase.obj - copy ..\common\$D\tbarsmpl.obj copy ..\common\$D\textcmn.obj copy ..\common\$D\textfile.obj - copy ..\common\$D\time.obj copy ..\common\$D\timercmn.obj copy ..\common\$D\tokenzr.obj copy ..\common\$D\txtstrm.obj @@ -644,10 +664,10 @@ $(COMLIBOBJS2): copy ..\common\$D\utilscmn.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\valtext.obj + copy ..\common\$D\variant.obj copy ..\common\$D\wfstream.obj copy ..\common\$D\wincmn.obj copy ..\common\$D\wxchar.obj @@ -663,7 +683,6 @@ $(GENLIBOBJS): copy ..\generic\$D\colrdlgg.obj copy ..\generic\$D\dcpsg.obj copy ..\generic\$D\grid.obj - copy ..\generic\$D\gridg.obj copy ..\generic\$D\helpext.obj copy ..\generic\$D\helphtml.obj copy ..\generic\$D\helpwxht.obj @@ -686,8 +705,28 @@ $(GENLIBOBJS): 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 @@ -717,26 +756,27 @@ $(OS2LIBOBJS1): copy ..\os2\$D\filedlg.obj copy ..\os2\$D\font.obj copy ..\os2\$D\fontdlg.obj + copy ..\os2\$D\fontenum.obj + copy ..\os2\$D\fontutil.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\icon.obj - copy ..\os2\$D\imaglist.obj copy ..\os2\$D\iniconf.obj copy ..\os2\$D\joystick.obj copy ..\os2\$D\listbox.obj - copy ..\os2\$D\listctrl.obj copy ..\os2\$D\main.obj copy ..\os2\$D\mdi.obj copy ..\os2\$D\menu.obj copy ..\os2\$D\menuitem.obj copy ..\os2\$D\metafile.obj copy ..\os2\$D\minifram.obj - copy ..\os2\$D\msgdlg.obj $(OS2LIBOBJS2): + copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj copy ..\os2\$D\notebook.obj copy ..\os2\$D\ownerdrw.obj @@ -756,7 +796,6 @@ $(OS2LIBOBJS2): copy ..\os2\$D\statbox.obj copy ..\os2\$D\statline.obj copy ..\os2\$D\stattext.obj - copy ..\os2\$D\statbrpm.obj copy ..\os2\$D\tabctrl.obj copy ..\os2\$D\taskbar.obj copy ..\os2\$D\textctrl.obj @@ -764,7 +803,6 @@ $(OS2LIBOBJS2): copy ..\os2\$D\timer.obj copy ..\os2\$D\toolbar.obj copy ..\os2\$D\tooltip.obj - copy ..\os2\$D\treectrl.obj copy ..\os2\$D\utils.obj copy ..\os2\$D\utilsexc.obj copy ..\os2\$D\wave.obj @@ -833,6 +871,13 @@ $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS) $**; << +$(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 @@ -861,6 +906,7 @@ $(WXDIR)\lib\wx.lib: \ $(COMTEMPTGT2) \ $(COMTEMPTGT3) \ $(GENTEMPTGT) \ + $(HTMLTEMPTGT) \ $(NONESTEMPTGT) \ $(OS2TEMPTGT1) \ $(OS2TEMPTGT2) \ @@ -874,6 +920,7 @@ $(WXDIR)\lib\wx.lib: \ del $(COMTEMPTGT2) del $(COMTEMPTGT3) del $(GENTEMPTGT) + del $(HTMLTEMPTGT) del $(NONESTEMPTGT) del $(OS2TEMPTGT1) del $(OS2TEMPTGT2) @@ -931,19 +978,60 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h $(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