X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f38c86f452b444cab9eff182f76196d01bc9d22..f00f657d37e530c55d5e98fac2477b477a6f1d36:/src/os2/makefile.va diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 8570d3904e..63af28dcc4 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -104,7 +104,9 @@ GENERICOBJS= \ ..\generic\$D\dirctrlg.obj \ ..\generic\$D\dragimgg.obj \ ..\generic\$D\fontdlgg.obj \ + ..\generic\$D\fdrepdlg.obj \ ..\generic\$D\grid.obj \ + ..\generic\$D\gridctrl.obj \ ..\generic\$D\gridsel.obj \ ..\generic\$D\helpext.obj \ ..\generic\$D\helphtml.obj \ @@ -123,7 +125,8 @@ GENERICOBJS= \ ..\generic\$D\propform.obj \ ..\generic\$D\proplist.obj \ ..\generic\$D\sashwin.obj \ - ..\generic\$D\scrolwin.obj \ + ..\generic\$D\scrlwing.obj \ + ..\generic\$D\spinctlg.obj \ ..\generic\$D\splitter.obj \ ..\generic\$D\statusbr.obj \ ..\generic\$D\tabg.obj \ @@ -148,7 +151,9 @@ GENLIBOBJS= \ dirctrlg.obj \ dragimgg.obj \ fontdlgg.obj \ + fdrepdlg.obj \ grid.obj \ + gridctrl.obj \ gridsel.obj \ helpext.obj \ helphtml.obj \ @@ -167,7 +172,8 @@ GENLIBOBJS= \ propform.obj \ proplist.obj \ sashwin.obj \ - scrolwin.obj \ + scrlwing.obj \ + spinctlg.obj \ splitter.obj \ statusbr.obj \ tabg.obj \ @@ -188,9 +194,12 @@ COMMONOBJS = \ ..\common\$D\appcmn.obj \ ..\common\$D\choiccmn.obj \ ..\common\$D\clipcmn.obj \ + ..\common\$D\clntdata.obj \ ..\common\$D\cmdline.obj \ ..\common\$D\cmndata.obj \ + ..\common\$D\cmdproc.obj \ ..\common\$D\config.obj \ + ..\common\$D\containr.obj \ ..\common\$D\cshelp.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ @@ -199,9 +208,11 @@ COMMONOBJS = \ !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 \ ..\common\$D\dndcmn.obj \ ..\common\$D\dobjcmn.obj \ @@ -213,6 +224,7 @@ COMMONOBJS = \ ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ + ..\common\$D\fddlgcmn.obj \ ..\common\$D\ffile.obj \ ..\common\$D\file.obj \ ..\common\$D\fileconf.obj \ @@ -226,6 +238,7 @@ COMMONOBJS = \ ..\common\$D\fs_mem.obj \ ..\common\$D\fs_zip.obj \ ..\common\$D\ftp.obj \ + ..\common\$D\gaugecmn.obj \ ..\common\$D\gdicmn.obj \ ..\common\$D\geometry.obj \ ..\common\$D\gifdecod.obj \ @@ -241,6 +254,7 @@ COMMONOBJS = \ ..\common\$D\imagpng.obj \ ..\common\$D\imagpnm.obj \ ..\common\$D\imagtiff.obj \ + ..\common\$D\imagxpm.obj \ ..\common\$D\intl.obj \ ..\common\$D\ipcbase.obj \ ..\common\$D\layout.obj \ @@ -254,6 +268,7 @@ COMMONOBJS = \ ..\common\$D\mimecmn.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ + ..\common\$D\nbkbase.obj \ ..\common\$D\object.obj \ ..\common\$D\objstrm.obj \ !if "$(WXMAKINGDLL)" != "1" @@ -261,10 +276,13 @@ COMMONOBJS = \ ..\common\$D\odbc.obj \ !endif ..\common\$D\paper.obj \ + ..\common\$D\popupcmn.obj \ ..\common\$D\prntbase.obj \ ..\common\$D\process.obj \ ..\common\$D\protocol.obj \ ..\common\$D\quantize.obj \ + ..\common\$D\radiocmn.obj \ + ..\common\$D\regex.obj \ ..\common\$D\resource.obj \ ..\common\$D\sckaddr.obj \ ..\common\$D\sckfile.obj \ @@ -273,14 +291,17 @@ COMMONOBJS = \ ..\common\$D\serbase.obj \ ..\common\$D\sizer.obj \ ..\common\$D\socket.obj \ + ..\common\$D\statbar.obj \ ..\common\$D\strconv.obj \ ..\common\$D\stream.obj \ ..\common\$D\string.obj \ + ..\common\$D\sysopt.obj \ ..\common\$D\tbarbase.obj \ ..\common\$D\textcmn.obj \ ..\common\$D\textfile.obj \ ..\common\$D\timercmn.obj \ ..\common\$D\tokenzr.obj \ + ..\common\$D\toplvcmn.obj \ ..\common\$D\treebase.obj \ ..\common\$D\txtstrm.obj \ ..\common\$D\unzip.obj \ @@ -294,6 +315,7 @@ COMMONOBJS = \ ..\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 @@ -302,17 +324,22 @@ COMLIBOBJS1 = \ appcmn.obj \ choiccmn.obj \ clipcmn.obj \ + clntdata.obj \ cmdline.obj \ cmndata.obj \ + cmdproc.obj \ config.obj \ + containr.obj \ cshelp.obj \ ctrlcmn.obj \ ctrlsub.obj \ datetime.obj \ datstrm.obj \ db.obj \ + dbgrid.obj \ dbtable.obj \ dcbase.obj \ + dircmn.obj \ dndcmn.obj \ dlgcmn.obj \ dobjcmn.obj \ @@ -324,6 +351,7 @@ COMLIBOBJS1 = \ encconv.obj \ event.obj \ extended.obj \ + fddlgcmn.obj \ ffile.obj \ file.obj \ fileconf.obj \ @@ -335,16 +363,17 @@ COMLIBOBJS1 = \ framecmn.obj \ fs_inet.obj \ fs_mem.obj \ - fs_zip.obj \ + fs_zip.obj + +COMLIBOBJS2 = \ ftp.obj \ + gaugecmn.obj \ gdicmn.obj \ geometry.obj \ gifdecod.obj \ hash.obj \ helpbase.obj \ - http.obj - -COMLIBOBJS2 = \ + http.obj \ imagall.obj \ imagbmp.obj \ image.obj \ @@ -354,6 +383,7 @@ COMLIBOBJS2 = \ imagpng.obj \ imagpnm.obj \ imagtiff.obj \ + imagxpm.obj \ intl.obj \ ipcbase.obj \ layout.obj \ @@ -367,14 +397,20 @@ COMLIBOBJS2 = \ mimecmn.obj \ module.obj \ mstream.obj \ + nbkbase.obj \ object.obj \ objstrm.obj \ odbc.obj \ paper.obj \ + popupcmn.obj \ prntbase.obj \ process.obj \ protocol.obj \ quantize.obj \ + radiocmn.obj + +COMLIBOBJS3 = \ + regex.obj \ resource.obj \ sckaddr.obj \ sckfile.obj \ @@ -383,16 +419,17 @@ COMLIBOBJS2 = \ serbase.obj \ sizer.obj \ socket.obj \ + statbar.obj \ strconv.obj \ stream.obj \ string.obj \ - tbarbase.obj - -COMLIBOBJS3 = \ + sysopt.obj \ + tbarbase.obj \ textcmn.obj \ textfile.obj \ timercmn.obj \ tokenzr.obj \ + toplvcmn.obj \ treebase.obj \ txtstrm.obj \ unzip.obj \ @@ -406,6 +443,7 @@ COMLIBOBJS3 = \ wincmn.obj \ wxchar.obj \ wxexpr.obj \ + xpmdecod.obj \ y_tab.obj \ zipstrm.obj \ zstream.obj @@ -446,6 +484,7 @@ OS2OBJS = \ ..\os2\$D\gdiimage.obj \ ..\os2\$D\gdiobj.obj \ ..\os2\$D\gsocket.obj \ + ..\os2\$D\gsockpm.obj \ ..\os2\$D\helpwin.obj \ ..\os2\$D\icon.obj \ ..\os2\$D\iniconf.obj \ @@ -527,6 +566,7 @@ OS2LIBOBJS1 = \ gdiimage.obj \ gdiobj.obj \ gsocket.obj \ + gsockpm.obj \ helpwin.obj \ icon.obj \ iniconf.obj \ @@ -535,10 +575,10 @@ OS2LIBOBJS1 = \ main.obj \ mdi.obj \ menu.obj \ - menuitem.obj \ - metafile.obj + menuitem.obj OS2LIBOBJS2 = \ + metafile.obj \ mimetype.obj \ minifram.obj \ msgdlg.obj \ @@ -622,7 +662,7 @@ HTMLLIBOBJS = \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS) # Normal, static library -all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET) +all: $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET) dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D @@ -630,6 +670,13 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D test: $(OS2DIR)\$D\wave.obj test2: ..\common\Debug\config.obj +# If taking wxWindows from CVS, setup.h doesn't exist yet. +$(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h + copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h + +$(WXDIR)\include\wx\setup.h: $(WXDIR)\include\wx\os2\setup.h + copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\setup.h + $D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp @@ -640,18 +687,23 @@ $(COMLIBOBJS1): copy ..\common\$D\appcmn.obj copy ..\common\$D\choiccmn.obj copy ..\common\$D\clipcmn.obj + copy ..\common\$D\clntdata.obj copy ..\common\$D\cmdline.obj copy ..\common\$D\cmndata.obj + copy ..\common\$D\cmdproc.obj copy ..\common\$D\config.obj + copy ..\common\$D\containr.obj copy ..\common\$D\cshelp.obj copy ..\common\$D\ctrlcmn.obj copy ..\common\$D\ctrlsub.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 copy ..\common\$D\dndcmn.obj copy ..\common\$D\dobjcmn.obj copy ..\common\$D\docmdi.obj @@ -662,6 +714,7 @@ $(COMLIBOBJS1): copy ..\common\$D\encconv.obj copy ..\common\$D\event.obj copy ..\common\$D\extended.obj + copy ..\common\$D\fddlgcmn.obj copy ..\common\$D\ffile.obj copy ..\common\$D\file.obj copy ..\common\$D\fileconf.obj @@ -674,15 +727,16 @@ $(COMLIBOBJS1): copy ..\common\$D\fs_inet.obj copy ..\common\$D\fs_mem.obj copy ..\common\$D\fs_zip.obj + +$(COMLIBOBJS2): copy ..\common\$D\ftp.obj + copy ..\common\$D\gaugecmn.obj copy ..\common\$D\gdicmn.obj copy ..\common\$D\geometry.obj copy ..\common\$D\gifdecod.obj copy ..\common\$D\hash.obj copy ..\common\$D\helpbase.obj copy ..\common\$D\http.obj - -$(COMLIBOBJS2): copy ..\common\$D\imagall.obj copy ..\common\$D\imagbmp.obj copy ..\common\$D\image.obj @@ -692,6 +746,7 @@ $(COMLIBOBJS2): copy ..\common\$D\imagpng.obj copy ..\common\$D\imagpnm.obj copy ..\common\$D\imagtiff.obj + copy ..\common\$D\imagxpm.obj copy ..\common\$D\intl.obj copy ..\common\$D\ipcbase.obj copy ..\common\$D\layout.obj @@ -705,14 +760,20 @@ $(COMLIBOBJS2): copy ..\common\$D\mimecmn.obj copy ..\common\$D\module.obj copy ..\common\$D\mstream.obj + copy ..\common\$D\nbkbase.obj copy ..\common\$D\object.obj copy ..\common\$D\objstrm.obj copy ..\common\$D\odbc.obj copy ..\common\$D\paper.obj + copy ..\common\$D\popupcmn.obj copy ..\common\$D\prntbase.obj copy ..\common\$D\process.obj copy ..\common\$D\protocol.obj copy ..\common\$D\quantize.obj + copy ..\common\$D\radiocmn.obj + +$(COMLIBOBJS3): + copy ..\common\$D\regex.obj copy ..\common\$D\resource.obj copy ..\common\$D\sckaddr.obj copy ..\common\$D\sckfile.obj @@ -721,16 +782,17 @@ $(COMLIBOBJS2): copy ..\common\$D\serbase.obj copy ..\common\$D\sizer.obj copy ..\common\$D\socket.obj + copy ..\common\$D\statbar.obj copy ..\common\$D\strconv.obj copy ..\common\$D\stream.obj copy ..\common\$D\string.obj + copy ..\common\$D\sysopt.obj copy ..\common\$D\tbarbase.obj - -$(COMLIBOBJS3): copy ..\common\$D\textcmn.obj copy ..\common\$D\textfile.obj copy ..\common\$D\timercmn.obj copy ..\common\$D\tokenzr.obj + copy ..\common\$D\toplvcmn.obj copy ..\common\$D\treebase.obj copy ..\common\$D\txtstrm.obj copy ..\common\$D\unzip.obj @@ -744,6 +806,7 @@ $(COMLIBOBJS3): copy ..\common\$D\wincmn.obj copy ..\common\$D\wxchar.obj copy ..\common\$D\wxexpr.obj + copy ..\common\$D\xpmdecod.obj copy ..\common\$D\y_tab.obj copy ..\common\$D\zipstrm.obj copy ..\common\$D\zstream.obj @@ -758,7 +821,9 @@ $(GENLIBOBJS): copy ..\generic\$D\dcpsg.obj copy ..\generic\$D\dirctrlg.obj copy ..\generic\$D\fontdlgg.obj + copy ..\generic\$D\fdrepdlg.obj copy ..\generic\$D\grid.obj + copy ..\generic\$D\gridctrl.obj copy ..\generic\$D\gridsel.obj copy ..\generic\$D\helpext.obj copy ..\generic\$D\helphtml.obj @@ -777,7 +842,8 @@ $(GENLIBOBJS): copy ..\generic\$D\propform.obj copy ..\generic\$D\proplist.obj copy ..\generic\$D\sashwin.obj - copy ..\generic\$D\scrolwin.obj + copy ..\generic\$D\scrlwing.obj + copy ..\generic\$D\spinctlg.obj copy ..\generic\$D\splitter.obj copy ..\generic\$D\statusbr.obj copy ..\generic\$D\tabg.obj @@ -847,6 +913,7 @@ $(OS2LIBOBJS1): copy ..\os2\$D\gdiimage.obj copy ..\os2\$D\gdiobj.obj copy ..\os2\$D\gsocket.obj + copy ..\os2\$D\gsockpm.obj copy ..\os2\$D\helpwin.obj copy ..\os2\$D\icon.obj copy ..\os2\$D\iniconf.obj @@ -856,9 +923,9 @@ $(OS2LIBOBJS1): copy ..\os2\$D\mdi.obj copy ..\os2\$D\menu.obj copy ..\os2\$D\menuitem.obj - copy ..\os2\$D\metafile.obj $(OS2LIBOBJS2): + copy ..\os2\$D\metafile.obj copy ..\os2\$D\mimetype.obj copy ..\os2\$D\minifram.obj copy ..\os2\$D\msgdlg.obj @@ -930,57 +997,57 @@ pch1: dirs $(DUMMYOBJ) ### Static library $(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1) - touch $(WXDIR)\lib\wxcom1.lib - del $(WXDIR)\lib\wxcom1.lib + -touch $(WXDIR)\lib\wxcom1.lib + -del $(WXDIR)\lib\wxcom1.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2) - touch $(WXDIR)\lib\wxcom2.lib - del $(WXDIR)\lib\wxcom2.lib + -touch $(WXDIR)\lib\wxcom2.lib + -del $(WXDIR)\lib\wxcom2.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3) - touch $(WXDIR)\lib\wxcom3.lib - del $(WXDIR)\lib\wxcom3.lib + -touch $(WXDIR)\lib\wxcom3.lib + -del $(WXDIR)\lib\wxcom3.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS) - touch $(WXDIR)\lib\wxgen.lib - del $(WXDIR)\lib\wxgen.lib + -touch $(WXDIR)\lib\wxgen.lib + -del $(WXDIR)\lib\wxgen.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS) - touch $(WXDIR)\lib\wxhtml.lib - del $(WXDIR)\lib\wxhtml.lib + -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 + -touch $(WXDIR)\lib\wxnones.lib + -del $(WXDIR)\lib\wxnones.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1) - touch $(WXDIR)\lib\wxos21.lib - del $(WXDIR)\lib\wxos21.lib + -touch $(WXDIR)\lib\wxos21.lib + -del $(WXDIR)\lib\wxos21.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2) - touch $(WXDIR)\lib\wxos22.lib - del $(WXDIR)\lib\wxos22.lib + -touch $(WXDIR)\lib\wxos22.lib + -del $(WXDIR)\lib\wxos22.lib ilib $(LIBFLAGS) $@ @<< $**; << @@ -997,8 +1064,8 @@ $(WXDIR)\lib\wx.lib: \ $(OS2TEMPTGT1) \ $(OS2TEMPTGT2) \ $(PERIPH_LIBS) - touch $(LIBTARGET) - del $(LIBTARGET) + -touch $(LIBTARGET) + -del $(LIBTARGET) ilib $(LIBFLAGS) $@ @<< $**; << @@ -1020,17 +1087,12 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS) $(LIBS) $(DUMMYOBJ) $(OBJECTS) - $(WXDIR)\lib\wx23.def + $(WXDIR)\src\os2\wx23.def << - implib $(WXDIR)\lib\wx23.lib $(WXDIR)\lib\wx23.def + implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def !endif -# If taking wxWindows from CVS, setup.h doesn't exist yet. -$(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h - copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\os2\setup.bak - copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h - ..\common\$D\extended.obj: ..\common\extended.c icc @<< $(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c @@ -1109,8 +1171,6 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t erase /N $(COMMDIR)\$D\*.obj erase /N $(HTMLDIR)\$D\*.obj erase /N $(OS2DIR)\$D\*.obj - erase /N $(COMMDIR)\y_tab.c - erase /N $(COMMDIR)\lex_yy.c rd $(D) rd ..\generic\$D rd ..\common\$D @@ -1120,6 +1180,8 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t !if "$(WXMAKINGDLL)" == "1" erase /N ..\..\lib\wx23.lib !endif + erase /N $(COMMDIR)\y_tab.c + erase /N $(COMMDIR)\lex_yy.c cleanall: clean