X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/makefile.va?ds=sidebyside diff --git a/src/os2/makefile.va b/src/os2/makefile.va index e5001f5cfc..6b662e3db8 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -114,7 +114,6 @@ GENERICOBJS= \ ..\generic\$D\helphtml.obj \ ..\generic\$D\imaglist.obj \ ..\generic\$D\laywin.obj \ - ..\generic\$D\listctrl.obj \ ..\generic\$D\logg.obj \ ..\generic\$D\mdig.obj \ ..\generic\$D\numdlgg.obj \ @@ -135,8 +134,6 @@ GENERICOBJS= \ ..\generic\$D\textdlgg.obj \ ..\generic\$D\tipdlg.obj \ ..\generic\$D\tipwin.obj \ - ..\generic\$D\treectlg.obj \ - ..\generic\$D\treelay.obj \ ..\generic\$D\wizard.obj # ..\generic\$D\gridg.obj \ @@ -161,7 +158,6 @@ GENLIBOBJS= \ helphtml.obj \ imaglist.obj \ laywin.obj \ - listctrl.obj \ logg.obj \ mdig.obj \ numdlgg.obj \ @@ -182,8 +178,6 @@ GENLIBOBJS= \ textdlgg.obj \ tipdlg.obj \ tipwin.obj \ - treectlg.obj \ - treelay.obj \ wizard.obj # These are generic things that don't need to be compiled on PM, @@ -192,6 +186,7 @@ NONESSENTIALOBJS= \ ..\generic\$D\msgdlgg.obj COMMONOBJS = \ + ..\common\$D\accesscmn.obj \ ..\common\$D\artprov.obj \ ..\common\$D\artstd.obj \ ..\common\$D\appcmn.obj \ @@ -206,14 +201,9 @@ COMMONOBJS = \ ..\common\$D\cshelp.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ + ..\common\$D\datacmn.obj \ ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ -!if "$(WXMAKINGDLL)" != "1" -# don't have an ODBC database - ..\common\$D\db.obj \ - ..\common\$D\dbgrid.obj \ - ..\common\$D\dbtable.obj \ -!endif ..\common\$D\dcbase.obj \ ..\common\$D\dircmn.obj \ ..\common\$D\dlgcmn.obj \ @@ -221,6 +211,7 @@ COMMONOBJS = \ ..\common\$D\dobjcmn.obj \ ..\common\$D\docmdi.obj \ ..\common\$D\docview.obj \ + ..\common\$D\dpycmn.obj \ ..\common\$D\dseldlg.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ @@ -280,10 +271,6 @@ COMMONOBJS = \ ..\common\$D\mstream.obj \ ..\common\$D\nbkbase.obj \ ..\common\$D\object.obj \ -!if "$(WXMAKINGDLL)" != "1" -# don't have an ODBC database - ..\common\$D\odbc.obj \ -!endif ..\common\$D\paper.obj \ ..\common\$D\popupcmn.obj \ ..\common\$D\prntbase.obj \ @@ -292,7 +279,7 @@ COMMONOBJS = \ ..\common\$D\quantize.obj \ ..\common\$D\radiocmn.obj \ ..\common\$D\regex.obj \ - ..\common\$D\resource.obj \ + ..\common\$D\rgncmn.obj \ ..\common\$D\sckaddr.obj \ ..\common\$D\sckfile.obj \ ..\common\$D\sckipc.obj \ @@ -320,17 +307,15 @@ COMMONOBJS = \ ..\common\$D\valgen.obj \ ..\common\$D\validate.obj \ ..\common\$D\valtext.obj \ - ..\common\$D\variant.obj \ ..\common\$D\wfstream.obj \ ..\common\$D\wincmn.obj \ ..\common\$D\wxchar.obj \ - ..\common\$D\wxexpr.obj \ ..\common\$D\xpmdecod.obj \ - ..\common\$D\y_tab.obj \ ..\common\$D\zipstrm.obj \ ..\common\$D\zstream.obj COMLIBOBJS1 = \ + accesscmn.obj \ artprov.obj \ artstd.obj \ appcmn.obj \ @@ -345,11 +330,9 @@ COMLIBOBJS1 = \ cshelp.obj \ ctrlcmn.obj \ ctrlsub.obj \ + datacmn.obj \ datetime.obj \ datstrm.obj \ - db.obj \ - dbgrid.obj \ - dbtable.obj \ dcbase.obj \ dircmn.obj \ dndcmn.obj \ @@ -358,6 +341,7 @@ COMLIBOBJS1 = \ docmdi.obj \ docview.obj \ dseldlg.obj \ + dpycmn.obj \ dynarray.obj \ dynlib.obj \ dynload.obj \ @@ -373,7 +357,7 @@ COMLIBOBJS1 = \ filename.obj \ filesys.obj \ fontcmn.obj \ - fontmap.obj + fontmap.obj \ COMLIBOBJS2 = \ framecmn.obj \ @@ -420,7 +404,6 @@ COMLIBOBJS2 = \ object.obj COMLIBOBJS3 = \ - odbc.obj \ paper.obj \ popupcmn.obj \ prntbase.obj \ @@ -429,7 +412,7 @@ COMLIBOBJS3 = \ quantize.obj \ radiocmn.obj \ regex.obj \ - resource.obj \ + rgncmn.obj \ sckaddr.obj \ sckfile.obj \ sckipc.obj \ @@ -457,15 +440,12 @@ COMLIBOBJS3 = \ valgen.obj \ validate.obj \ valtext.obj \ - variant.obj \ wfstream.obj \ wincmn.obj \ wxchar.obj \ - wxexpr.obj \ xpmdecod.obj COMLIBOBJS4 = \ - y_tab.obj \ zipstrm.obj \ zstream.obj @@ -510,6 +490,7 @@ OS2OBJS = \ ..\os2\$D\iniconf.obj \ ..\os2\$D\joystick.obj \ ..\os2\$D\listbox.obj \ + ..\os2\$D\listctrl.obj \ ..\os2\$D\main.obj \ ..\os2\$D\menu.obj \ ..\os2\$D\menuitem.obj \ @@ -536,13 +517,13 @@ OS2OBJS = \ ..\os2\$D\statline.obj \ ..\os2\$D\stattext.obj \ ..\os2\$D\tabctrl.obj \ - ..\os2\$D\taskbar.obj \ ..\os2\$D\textctrl.obj \ ..\os2\$D\thread.obj \ ..\os2\$D\timer.obj \ ..\os2\$D\toolbar.obj \ ..\os2\$D\tooltip.obj \ ..\os2\$D\toplevel.obj \ + ..\os2\$D\treectrl.obj \ ..\os2\$D\utils.obj \ ..\os2\$D\utilsexc.obj \ ..\os2\$D\wave.obj \ @@ -589,13 +570,14 @@ OS2LIBOBJS1 = \ iniconf.obj \ joystick.obj \ listbox.obj \ + listctrl.obj \ main.obj \ menu.obj \ menuitem.obj \ - metafile.obj \ - mimetype.obj + metafile.obj OS2LIBOBJS2 = \ + mimetype.obj \ msgdlg.obj \ nativdlg.obj \ notebook.obj \ @@ -617,13 +599,13 @@ OS2LIBOBJS2 = \ stattext.obj \ statline.obj \ tabctrl.obj \ - taskbar.obj \ textctrl.obj \ thread.obj \ timer.obj \ toolbar.obj \ tooltip.obj \ toplevel.obj \ + treectrl.obj \ utils.obj \ utilsexc.obj \ wave.obj \ @@ -699,6 +681,7 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp $(COMLIBOBJS1): + copy ..\common\$D\accesscmn.obj copy ..\common\$D\artprov.obj copy ..\common\$D\artstd.obj copy ..\common\$D\appcmn.obj @@ -713,11 +696,9 @@ $(COMLIBOBJS1): copy ..\common\$D\cshelp.obj copy ..\common\$D\ctrlcmn.obj copy ..\common\$D\ctrlsub.obj + copy ..\common\$D\datacmn.obj copy ..\common\$D\datetime.obj copy ..\common\$D\datstrm.obj - copy ..\common\$D\db.obj - copy ..\common\$D\dbgrid.obj - copy ..\common\$D\dbtable.obj copy ..\common\$D\dcbase.obj copy ..\common\$D\dlgcmn.obj copy ..\common\$D\dircmn.obj @@ -725,6 +706,7 @@ $(COMLIBOBJS1): copy ..\common\$D\dobjcmn.obj copy ..\common\$D\docmdi.obj copy ..\common\$D\docview.obj + copy ..\common\$D\dpycmn.obj copy ..\common\$D\dseldlg.obj copy ..\common\$D\dynarray.obj copy ..\common\$D\dynlib.obj @@ -788,7 +770,6 @@ $(COMLIBOBJS2): copy ..\common\$D\object.obj $(COMLIBOBJS3): - copy ..\common\$D\odbc.obj copy ..\common\$D\paper.obj copy ..\common\$D\popupcmn.obj copy ..\common\$D\prntbase.obj @@ -797,7 +778,7 @@ $(COMLIBOBJS3): copy ..\common\$D\quantize.obj copy ..\common\$D\radiocmn.obj copy ..\common\$D\regex.obj - copy ..\common\$D\resource.obj + copy ..\common\$D\rgncmn.obj copy ..\common\$D\sckaddr.obj copy ..\common\$D\sckfile.obj copy ..\common\$D\sckipc.obj @@ -825,15 +806,12 @@ $(COMLIBOBJS3): copy ..\common\$D\valgen.obj copy ..\common\$D\validate.obj 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 - copy ..\common\$D\wxexpr.obj copy ..\common\$D\xpmdecod.obj $(COMLIBOBJS4): - copy ..\common\$D\y_tab.obj copy ..\common\$D\zipstrm.obj copy ..\common\$D\zstream.obj @@ -856,7 +834,6 @@ $(GENLIBOBJS): copy ..\generic\$D\helphtml.obj copy ..\generic\$D\imaglist.obj copy ..\generic\$D\laywin.obj - copy ..\generic\$D\listctrl.obj copy ..\generic\$D\logg.obj copy ..\generic\$D\mdig.obj copy ..\generic\$D\numdlgg.obj @@ -877,8 +854,6 @@ $(GENLIBOBJS): copy ..\generic\$D\textdlgg.obj copy ..\generic\$D\tipdlg.obj copy ..\generic\$D\tipwin.obj - copy ..\generic\$D\treectlg.obj - copy ..\generic\$D\treelay.obj copy ..\generic\$D\wizard.obj $(HTMLLIBOBJS): @@ -944,13 +919,14 @@ $(OS2LIBOBJS1): 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\menu.obj copy ..\os2\$D\menuitem.obj copy ..\os2\$D\metafile.obj - copy ..\os2\$D\mimetype.obj $(OS2LIBOBJS2): + copy ..\os2\$D\mimetype.obj copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj copy ..\os2\$D\notebook.obj @@ -972,13 +948,13 @@ $(OS2LIBOBJS2): copy ..\os2\$D\statline.obj copy ..\os2\$D\stattext.obj copy ..\os2\$D\tabctrl.obj - copy ..\os2\$D\taskbar.obj copy ..\os2\$D\textctrl.obj copy ..\os2\$D\thread.obj copy ..\os2\$D\timer.obj copy ..\os2\$D\toolbar.obj copy ..\os2\$D\tooltip.obj copy ..\os2\$D\toplevel.obj + copy ..\os2\$D\treectrl.obj copy ..\os2\$D\utils.obj copy ..\os2\$D\utilsexc.obj copy ..\os2\$D\wave.obj @@ -1113,15 +1089,15 @@ $(WXDIR)\lib\wx.lib: \ !else # Update the dynamic link library -$(WXDIR)\lib\wx23.dll: $(OBJECTS) +$(WXDIR)\lib\wx25.dll: $(OBJECTS) icc @<< /B" $(LINKFLAGS)" /Fe$@ $(LIBS) $(DUMMYOBJ) $(OBJECTS) - $(WXDIR)\src\os2\wx23.def + $(WXDIR)\src\os2\wx25.def << - implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def + implib $(WXDIR)\lib\wx25.lib $(WXDIR)\src\os2\wx25.def !endif @@ -1130,17 +1106,6 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS) $(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c << -..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c - icc @<< -$(CPPFLAGS2) /DUSE_DEFINE /DYY_USE_PROTOS /Fo$@ ..\common\y_tab.c -<< - -..\common\y_tab.c: ..\common\dosyacc.c - copy "..\common"\dosyacc.c "..\common"\y_tab.c - -..\common\lex_yy.c: ..\common\doslex.c - copy "..\common"\doslex.c "..\common"\lex_yy.c - $(OBJECTS): $(WXDIR)/include/wx/setup.h ..\common\$D\unzip.obj: ..\common\unzip.c @@ -1198,12 +1163,10 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff rd ..\common\$D rd ..\html\$D rd ..\os2\$D - del $(LIBTARGET) + del ..\lib\wx.lib !if "$(WXMAKINGDLL)" == "1" - erase /N ..\..\lib\wx23.lib + del ..\lib\wx25.lib !endif - erase /N $(COMMDIR)\y_tab.c - erase /N $(COMMDIR)\lex_yy.c cleanall: clean