X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70190256155c4b5efcc9062bf29bb4ef6e1f4473..e90babdf85c9c8025e7f0647c0270de6d7e44a63:/src/msw/makefile.vc?ds=sidebyside diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index fe713b0eaa..8303dca518 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -70,6 +70,7 @@ GENERICOBJS= \ ..\generic\$D\gridg.obj \ ..\generic\$D\laywin.obj \ ..\generic\$D\panelg.obj \ + ..\generic\$D\progdlgg.obj \ ..\generic\$D\prop.obj \ ..\generic\$D\propform.obj \ ..\generic\$D\proplist.obj \ @@ -98,6 +99,7 @@ NONESSENTIALOBJS= \ COMMONOBJS = \ ..\common\$D\cmndata.obj \ ..\common\$D\config.obj \ + ..\common\$D\dcbase.obj \ ..\common\$D\db.obj \ ..\common\$D\dbtable.obj \ ..\common\$D\docview.obj \ @@ -174,6 +176,7 @@ MSWOBJS = \ ..\msw\$D\button.obj \ ..\msw\$D\checkbox.obj \ ..\msw\$D\checklst.obj \ + ..\msw\$D\caret.obj \ ..\msw\$D\choice.obj \ ..\msw\$D\clipbrd.obj \ ..\msw\$D\colordlg.obj \ @@ -263,7 +266,7 @@ MSWOBJS = \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # Normal, static library -all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm $(LIBTARGET) +all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D @@ -412,6 +415,16 @@ clean_zlib: nmake -f makefile.vc clean cd $(WXDIR)\src\msw +jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all + cd $(WXDIR)\src\msw + +clean_jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.vc clean + cd $(WXDIR)\src\msw + xpm: cd $(WXDIR)\src\xpm nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) @@ -427,7 +440,7 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm -erase $(LIBTARGET) -erase $(WXDIR)\lib\$(WXLIBNAME).pdb -erase ..\..\lib\wx200.dll