X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf6acbf261c5d47f97d280700b1203f3d8d8047..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/os2/makefile.va?ds=sidebyside diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 43126e0ee9..e8c55fb4d0 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -101,6 +101,7 @@ GENERICOBJS= \ ..\generic\$D\choicdgg.obj \ ..\generic\$D\colrdlgg.obj \ ..\generic\$D\dcpsg.obj \ + ..\generic\$D\dirdlgg.obj \ ..\generic\$D\dirctrlg.obj \ ..\generic\$D\dragimgg.obj \ ..\generic\$D\fontdlgg.obj \ @@ -111,7 +112,6 @@ GENERICOBJS= \ ..\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 \ @@ -148,6 +148,7 @@ GENLIBOBJS= \ choicdgg.obj \ colrdlgg.obj \ dcpsg.obj \ + dirdlgg.obj \ dirctrlg.obj \ dragimgg.obj \ fontdlgg.obj \ @@ -158,7 +159,6 @@ GENLIBOBJS= \ helpext.obj \ helphtml.obj \ helpwxht.obj \ - helpxlp.obj \ imaglist.obj \ laywin.obj \ listctrl.obj \ @@ -218,8 +218,10 @@ 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 \ @@ -243,12 +245,14 @@ COMMONOBJS = \ ..\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\imagall.obj \ ..\common\$D\imagbmp.obj \ ..\common\$D\image.obj \ ..\common\$D\imaggif.obj \ + ..\common\$D\imagiff.obj \ ..\common\$D\imagjpeg.obj \ ..\common\$D\imagpcx.obj \ ..\common\$D\imagpng.obj \ @@ -270,7 +274,6 @@ COMMONOBJS = \ ..\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 \ @@ -288,7 +291,6 @@ COMMONOBJS = \ ..\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 \ @@ -346,8 +348,10 @@ COMLIBOBJS1 = \ dobjcmn.obj \ docmdi.obj \ docview.obj \ + dseldlg.obj \ dynarray.obj \ dynlib.obj \ + dynload.obj \ effects.obj \ encconv.obj \ event.obj \ @@ -362,23 +366,25 @@ COMLIBOBJS1 = \ fontcmn.obj \ fontmap.obj \ framecmn.obj \ - fs_inet.obj \ - fs_mem.obj \ - fs_zip.obj + fs_inet.obj COMLIBOBJS2 = \ + fs_mem.obj \ + fs_zip.obj \ ftp.obj \ gaugecmn.obj \ gdicmn.obj \ geometry.obj \ gifdecod.obj \ hash.obj \ + hashmap.obj \ helpbase.obj \ http.obj \ imagall.obj \ imagbmp.obj \ image.obj \ imaggif.obj \ + imagiff.obj \ imagjpeg.obj \ imagpcx.obj \ imagpng.obj \ @@ -400,24 +406,22 @@ COMLIBOBJS2 = \ mstream.obj \ nbkbase.obj \ object.obj \ - objstrm.obj \ odbc.obj \ paper.obj \ popupcmn.obj \ prntbase.obj \ - process.obj \ - protocol.obj \ - quantize.obj \ - radiocmn.obj + process.obj COMLIBOBJS3 = \ + protocol.obj \ + quantize.obj \ + radiocmn.obj \ regex.obj \ resource.obj \ sckaddr.obj \ sckfile.obj \ sckipc.obj \ sckstrm.obj \ - serbase.obj \ sizer.obj \ socket.obj \ statbar.obj \ @@ -474,7 +478,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 \ @@ -526,11 +529,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 \ @@ -556,7 +559,6 @@ OS2LIBOBJS1 = \ dcscreen.obj \ dialog.obj \ dir.obj \ - dirdlg.obj \ dnd.obj \ filedlg.obj \ font.obj \ @@ -577,10 +579,10 @@ OS2LIBOBJS1 = \ main.obj \ mdi.obj \ menu.obj \ - menuitem.obj + menuitem.obj \ + metafile.obj OS2LIBOBJS2 = \ - metafile.obj \ mimetype.obj \ minifram.obj \ msgdlg.obj \ @@ -610,11 +612,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 \ @@ -635,6 +637,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 @@ -657,6 +660,7 @@ HTMLLIBOBJS = \ m_list.obj \ m_meta.obj \ m_pre.obj \ + m_style.obj \ m_tables.obj \ winpars.obj @@ -664,7 +668,7 @@ HTMLLIBOBJS = \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS) # Normal, static library -all: $(WXDIR)\include\wx\setup.h $(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 @@ -710,8 +714,10 @@ $(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 @@ -727,22 +733,24 @@ $(COMLIBOBJS1): copy ..\common\$D\fontmap.obj copy ..\common\$D\framecmn.obj copy ..\common\$D\fs_inet.obj - copy ..\common\$D\fs_mem.obj - copy ..\common\$D\fs_zip.obj $(COMLIBOBJS2): + 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 + copy ..\common\$D\hashmap.obj copy ..\common\$D\helpbase.obj copy ..\common\$D\http.obj copy ..\common\$D\imagall.obj copy ..\common\$D\imagbmp.obj copy ..\common\$D\image.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 @@ -764,24 +772,22 @@ $(COMLIBOBJS2): 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 + +$(COMLIBOBJS3): 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 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 @@ -822,6 +828,7 @@ $(GENLIBOBJS): copy ..\generic\$D\colrdlgg.obj copy ..\generic\$D\dragimgg.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 @@ -831,7 +838,6 @@ $(GENLIBOBJS): 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 @@ -877,6 +883,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 @@ -904,7 +911,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 @@ -926,9 +932,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 @@ -958,11 +964,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: @@ -1149,16 +1155,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) @@ -1169,7 +1165,7 @@ 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