X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/254ccb8c06f6242cac31be0b8450c6bd5dcdeea7..40f7145ca55ccf1b197e70acf79bbd4aa5d85145:/src/os2/makefile.va?ds=sidebyside diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 8e938b9b24..003352d949 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -100,17 +100,18 @@ GENERICOBJS= \ ..\generic\$D\caret.obj \ ..\generic\$D\choicdgg.obj \ ..\generic\$D\colrdlgg.obj \ + ..\generic\$D\dcbuffer.obj \ ..\generic\$D\dcpsg.obj \ + ..\generic\$D\dirdlgg.obj \ ..\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 \ - ..\generic\$D\helpwxht.obj \ - ..\generic\$D\helpxlp.obj \ ..\generic\$D\imaglist.obj \ ..\generic\$D\laywin.obj \ ..\generic\$D\listctrl.obj \ @@ -124,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 \ @@ -145,17 +147,18 @@ GENLIBOBJS= \ caret.obj \ choicdgg.obj \ colrdlgg.obj \ + dcbuffer.obj \ dcpsg.obj \ + dirdlgg.obj \ dirctrlg.obj \ dragimgg.obj \ fontdlgg.obj \ + fdrepdlg.obj \ grid.obj \ gridctrl.obj \ gridsel.obj \ helpext.obj \ helphtml.obj \ - helpwxht.obj \ - helpxlp.obj \ imaglist.obj \ laywin.obj \ listctrl.obj \ @@ -169,7 +172,8 @@ GENLIBOBJS= \ propform.obj \ proplist.obj \ sashwin.obj \ - scrolwin.obj \ + scrlwing.obj \ + spinctlg.obj \ splitter.obj \ statusbr.obj \ tabg.obj \ @@ -187,12 +191,17 @@ NONESSENTIALOBJS= \ ..\generic\$D\msgdlgg.obj COMMONOBJS = \ + ..\common\$D\artprov.obj \ + ..\common\$D\artstd.obj \ ..\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 \ @@ -211,12 +220,15 @@ COMMONOBJS = \ ..\common\$D\dobjcmn.obj \ ..\common\$D\docmdi.obj \ ..\common\$D\docview.obj \ + ..\common\$D\dseldlg.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\dynload.obj \ ..\common\$D\effects.obj \ ..\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 \ @@ -230,16 +242,21 @@ 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 \ ..\common\$D\hash.obj \ + ..\common\$D\hashmap.obj \ ..\common\$D\helpbase.obj \ ..\common\$D\http.obj \ + ..\common\$D\iconbndl.obj \ ..\common\$D\imagall.obj \ ..\common\$D\imagbmp.obj \ ..\common\$D\image.obj \ + ..\common\$D\imagfill.obj \ ..\common\$D\imaggif.obj \ + ..\common\$D\imagiff.obj \ ..\common\$D\imagjpeg.obj \ ..\common\$D\imagpcx.obj \ ..\common\$D\imagpng.obj \ @@ -259,33 +276,39 @@ 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" # don't have an ODBC database ..\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 \ ..\common\$D\sckipc.obj \ ..\common\$D\sckstrm.obj \ - ..\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\textbuf.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 \ @@ -305,12 +328,17 @@ COMMONOBJS = \ ..\common\$D\zstream.obj COMLIBOBJS1 = \ + artprov.obj \ + artstd.obj \ appcmn.obj \ choiccmn.obj \ clipcmn.obj \ + clntdata.obj \ cmdline.obj \ cmndata.obj \ + cmdproc.obj \ config.obj \ + containr.obj \ cshelp.obj \ ctrlcmn.obj \ ctrlsub.obj \ @@ -326,12 +354,15 @@ COMLIBOBJS1 = \ dobjcmn.obj \ docmdi.obj \ docview.obj \ + dseldlg.obj \ dynarray.obj \ dynlib.obj \ + dynload.obj \ effects.obj \ encconv.obj \ event.obj \ extended.obj \ + fddlgcmn.obj \ ffile.obj \ file.obj \ fileconf.obj \ @@ -339,24 +370,29 @@ COMLIBOBJS1 = \ filename.obj \ filesys.obj \ fontcmn.obj \ - fontmap.obj \ + fontmap.obj + +COMLIBOBJS2 = \ framecmn.obj \ fs_inet.obj \ fs_mem.obj \ fs_zip.obj \ ftp.obj \ + gaugecmn.obj \ gdicmn.obj \ geometry.obj \ gifdecod.obj \ - hash.obj - -COMLIBOBJS2 = \ + hash.obj \ + hashmap.obj \ helpbase.obj \ http.obj \ + iconbndl.obj \ imagall.obj \ imagbmp.obj \ image.obj \ + imagfill.obj \ imaggif.obj \ + imagiff.obj \ imagjpeg.obj \ imagpcx.obj \ imagpng.obj \ @@ -376,32 +412,38 @@ COMLIBOBJS2 = \ mimecmn.obj \ module.obj \ mstream.obj \ + nbkbase.obj \ object.obj \ - objstrm.obj \ - odbc.obj \ + odbc.obj + +COMLIBOBJS3 = \ paper.obj \ + popupcmn.obj \ prntbase.obj \ process.obj \ protocol.obj \ quantize.obj \ + radiocmn.obj \ + regex.obj \ resource.obj \ sckaddr.obj \ sckfile.obj \ sckipc.obj \ sckstrm.obj \ - serbase.obj \ sizer.obj \ socket.obj \ - strconv.obj - -COMLIBOBJS3 = \ + statbar.obj \ + strconv.obj \ stream.obj \ string.obj \ + sysopt.obj \ tbarbase.obj \ + textbuf.obj \ textcmn.obj \ textfile.obj \ timercmn.obj \ tokenzr.obj \ + toplvcmn.obj \ treebase.obj \ txtstrm.obj \ unzip.obj \ @@ -444,7 +486,6 @@ OS2OBJS = \ ..\os2\$D\dcscreen.obj \ ..\os2\$D\dialog.obj \ ..\os2\$D\dir.obj \ - ..\os2\$D\dirdlg.obj \ ..\os2\$D\dnd.obj \ ..\os2\$D\filedlg.obj \ ..\os2\$D\font.obj \ @@ -496,11 +537,11 @@ OS2OBJS = \ ..\os2\$D\timer.obj \ ..\os2\$D\toolbar.obj \ ..\os2\$D\tooltip.obj \ + ..\os2\$D\toplevel.obj \ ..\os2\$D\utils.obj \ ..\os2\$D\utilsexc.obj \ ..\os2\$D\wave.obj \ - ..\os2\$D\window.obj \ - ..\os2\$D\xpmhand.obj + ..\os2\$D\window.obj OS2LIBOBJS1 = \ accel.obj \ @@ -526,7 +567,6 @@ OS2LIBOBJS1 = \ dcscreen.obj \ dialog.obj \ dir.obj \ - dirdlg.obj \ dnd.obj \ filedlg.obj \ font.obj \ @@ -547,10 +587,10 @@ OS2LIBOBJS1 = \ main.obj \ mdi.obj \ menu.obj \ - menuitem.obj + menuitem.obj \ + metafile.obj OS2LIBOBJS2 = \ - metafile.obj \ mimetype.obj \ minifram.obj \ msgdlg.obj \ @@ -580,11 +620,11 @@ OS2LIBOBJS2 = \ timer.obj \ toolbar.obj \ tooltip.obj \ + toplevel.obj \ utils.obj \ utilsexc.obj \ wave.obj \ - window.obj \ - xpmhand.obj + window.obj HTMLOBJS = \ ..\html\$D\helpctrl.obj \ @@ -605,6 +645,7 @@ HTMLOBJS = \ ..\html\$D\m_list.obj \ ..\html\$D\m_meta.obj \ ..\html\$D\m_pre.obj \ + ..\html\$D\m_style.obj \ ..\html\$D\m_tables.obj \ ..\html\$D\winpars.obj @@ -627,6 +668,7 @@ HTMLLIBOBJS = \ m_list.obj \ m_meta.obj \ m_pre.obj \ + m_style.obj \ m_tables.obj \ winpars.obj @@ -634,7 +676,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 tiff $(LIBTARGET) dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D @@ -642,6 +684,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 @@ -649,12 +698,17 @@ $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\artprov.obj + copy ..\common\$D\artstd.obj 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 @@ -670,12 +724,15 @@ $(COMLIBOBJS1): copy ..\common\$D\dobjcmn.obj copy ..\common\$D\docmdi.obj copy ..\common\$D\docview.obj + copy ..\common\$D\dseldlg.obj copy ..\common\$D\dynarray.obj copy ..\common\$D\dynlib.obj + copy ..\common\$D\dynload.obj copy ..\common\$D\effects.obj 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 @@ -684,23 +741,28 @@ $(COMLIBOBJS1): copy ..\common\$D\filesys.obj copy ..\common\$D\fontcmn.obj copy ..\common\$D\fontmap.obj + +$(COMLIBOBJS2): copy ..\common\$D\framecmn.obj copy ..\common\$D\fs_inet.obj copy ..\common\$D\fs_mem.obj copy ..\common\$D\fs_zip.obj 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 - -$(COMLIBOBJS2): + copy ..\common\$D\hashmap.obj copy ..\common\$D\helpbase.obj copy ..\common\$D\http.obj + copy ..\common\$D\iconbndl.obj copy ..\common\$D\imagall.obj copy ..\common\$D\imagbmp.obj copy ..\common\$D\image.obj + copy ..\common\$D\imagfill.obj copy ..\common\$D\imaggif.obj + copy ..\common\$D\imagiff.obj copy ..\common\$D\imagjpeg.obj copy ..\common\$D\imagpcx.obj copy ..\common\$D\imagpng.obj @@ -720,32 +782,38 @@ $(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 + +$(COMLIBOBJS3): 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 + copy ..\common\$D\regex.obj copy ..\common\$D\resource.obj copy ..\common\$D\sckaddr.obj copy ..\common\$D\sckfile.obj copy ..\common\$D\sckipc.obj copy ..\common\$D\sckstrm.obj - 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 - -$(COMLIBOBJS3): copy ..\common\$D\stream.obj copy ..\common\$D\string.obj + copy ..\common\$D\sysopt.obj copy ..\common\$D\tbarbase.obj + copy ..\common\$D\textbuf.obj 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 @@ -771,16 +839,17 @@ $(GENLIBOBJS): copy ..\generic\$D\choicdgg.obj copy ..\generic\$D\colrdlgg.obj copy ..\generic\$D\dragimgg.obj + copy ..\generic\$D\dcbuffer.obj copy ..\generic\$D\dcpsg.obj + copy ..\generic\$D\dirdlgg.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 - copy ..\generic\$D\helpwxht.obj - copy ..\generic\$D\helpxlp.obj copy ..\generic\$D\imaglist.obj copy ..\generic\$D\laywin.obj copy ..\generic\$D\listctrl.obj @@ -794,7 +863,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 @@ -825,6 +895,7 @@ $(HTMLLIBOBJS): copy ..\html\$D\m_list.obj copy ..\html\$D\m_meta.obj copy ..\html\$D\m_pre.obj + copy ..\html\$D\m_style.obj copy ..\html\$D\m_tables.obj copy ..\html\$D\winpars.obj @@ -852,7 +923,6 @@ $(OS2LIBOBJS1): copy ..\os2\$D\dcscreen.obj copy ..\os2\$D\dialog.obj copy ..\os2\$D\dir.obj - copy ..\os2\$D\dirdlg.obj copy ..\os2\$D\dnd.obj copy ..\os2\$D\filedlg.obj copy ..\os2\$D\font.obj @@ -874,9 +944,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 @@ -906,11 +976,11 @@ $(OS2LIBOBJS2): copy ..\os2\$D\timer.obj copy ..\os2\$D\toolbar.obj copy ..\os2\$D\tooltip.obj + copy ..\os2\$D\toplevel.obj copy ..\os2\$D\utils.obj copy ..\os2\$D\utilsexc.obj copy ..\os2\$D\wave.obj copy ..\os2\$D\window.obj - copy ..\os2\$D\xpmhand.obj # wxWindows library as DLL dll: @@ -1044,11 +1114,6 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS) !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 @@ -1102,16 +1167,6 @@ clean_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 - tiff: cd $(WXDIR)\src\tiff nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) @@ -1122,13 +1177,11 @@ clean_tiff: nmake -f makefile.va clean cd $(WXDIR)\src\os2 -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff erase /N $(GENDIR)\$D\*.obj 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 @@ -1138,6 +1191,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