X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c344e89c6dbe3776e529fb86bdeb2829d36fb2f..71110b404c5cbef2175b2be645783e93d9a2b8c4:/src/os2/makefile.va?ds=sidebyside diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 3ab391d99e..7ea6679d1e 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -100,6 +100,7 @@ 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 \ @@ -111,7 +112,6 @@ GENERICOBJS= \ ..\generic\$D\gridsel.obj \ ..\generic\$D\helpext.obj \ ..\generic\$D\helphtml.obj \ - ..\generic\$D\helpwxht.obj \ ..\generic\$D\imaglist.obj \ ..\generic\$D\laywin.obj \ ..\generic\$D\listctrl.obj \ @@ -147,6 +147,7 @@ GENLIBOBJS= \ caret.obj \ choicdgg.obj \ colrdlgg.obj \ + dcbuffer.obj \ dcpsg.obj \ dirdlgg.obj \ dirctrlg.obj \ @@ -158,7 +159,6 @@ GENLIBOBJS= \ gridsel.obj \ helpext.obj \ helphtml.obj \ - helpwxht.obj \ imaglist.obj \ laywin.obj \ listctrl.obj \ @@ -191,6 +191,8 @@ 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 \ @@ -324,6 +326,8 @@ COMMONOBJS = \ ..\common\$D\zstream.obj COMLIBOBJS1 = \ + artprov.obj \ + artstd.obj \ appcmn.obj \ choiccmn.obj \ clipcmn.obj \ @@ -364,11 +368,11 @@ COMLIBOBJS1 = \ filename.obj \ filesys.obj \ fontcmn.obj \ - fontmap.obj \ - framecmn.obj \ - fs_inet.obj + fontmap.obj COMLIBOBJS2 = \ + framecmn.obj \ + fs_inet.obj \ fs_mem.obj \ fs_zip.obj \ ftp.obj \ @@ -408,11 +412,11 @@ COMLIBOBJS2 = \ object.obj \ odbc.obj \ paper.obj \ - popupcmn.obj \ - prntbase.obj \ - process.obj + popupcmn.obj COMLIBOBJS3 = \ + prntbase.obj \ + process.obj \ protocol.obj \ quantize.obj \ radiocmn.obj \ @@ -690,6 +694,8 @@ $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 @@ -731,10 +737,10 @@ $(COMLIBOBJS1): 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 $(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 @@ -775,10 +781,10 @@ $(COMLIBOBJS2): 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\prntbase.obj + copy ..\common\$D\process.obj copy ..\common\$D\protocol.obj copy ..\common\$D\quantize.obj copy ..\common\$D\radiocmn.obj @@ -827,6 +833,7 @@ $(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 @@ -837,7 +844,6 @@ $(GENLIBOBJS): copy ..\generic\$D\gridsel.obj copy ..\generic\$D\helpext.obj copy ..\generic\$D\helphtml.obj - copy ..\generic\$D\helpwxht.obj copy ..\generic\$D\imaglist.obj copy ..\generic\$D\laywin.obj copy ..\generic\$D\listctrl.obj @@ -1165,7 +1171,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