X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f58d1d997892f9420ee3de0159c4cb2d50449663..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/makefile.vc?ds=sidebyside diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 8533255bcc..500d68191d 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -35,7 +35,7 @@ PERIPH_CLEAN_TARGET= # Set to 0 if not using GLCanvas (only affects DLL build) USE_GLCANVAS=1 -# Set to 0 if you are using MSVC 5 +# Set to 1 if you are using MSVC 5 USE_MSVC_5=0 # These are absolute paths, so that the compiler @@ -103,11 +103,9 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \ $(GENDIR)\$D\numdlgg.obj \ $(GENDIR)\$D\panelg.obj \ $(GENDIR)\$D\progdlgg.obj \ - $(GENDIR)\$D\prop.obj \ - $(GENDIR)\$D\propform.obj \ - $(GENDIR)\$D\proplist.obj \ $(GENDIR)\$D\sashwin.obj \ $(GENDIR)\$D\scrlwing.obj \ + $(GENDIR)\$D\selstore.obj \ $(GENDIR)\$D\spinctlg.obj \ $(GENDIR)\$D\splash.obj \ $(GENDIR)\$D\splitter.obj \ @@ -117,7 +115,6 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \ $(GENDIR)\$D\tipdlg.obj \ $(GENDIR)\$D\tipwin.obj \ $(GENDIR)\$D\treectlg.obj \ - $(GENDIR)\$D\treelay.obj \ $(GENDIR)\$D\wizard.obj # These are generic things that don't need to be compiled on MSW, @@ -127,7 +124,6 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ $(GENDIR)\$D\filedlgg.obj \ $(GENDIR)\$D\fontdlgg.obj \ $(GENDIR)\$D\helpext.obj \ - $(GENDIR)\$D\helphtml.obj \ $(GENDIR)\$D\imaglist.obj \ $(GENDIR)\$D\listctrl.obj \ $(GENDIR)\$D\mdig.obj \ @@ -136,7 +132,8 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ $(GENDIR)\$D\tabg.obj COMMONOBJS = \ - $(COMMDIR)\$D\y_tab.obj \ + $(COMMDIR)\$D\accesscmn.obj \ + $(COMMDIR)\$D\appbase.obj \ $(COMMDIR)\$D\appcmn.obj \ $(COMMDIR)\$D\artprov.obj \ $(COMMDIR)\$D\artstd.obj \ @@ -151,6 +148,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\cshelp.obj \ $(COMMDIR)\$D\ctrlcmn.obj \ $(COMMDIR)\$D\ctrlsub.obj \ + $(COMMDIR)\$D\datacmn.obj \ $(COMMDIR)\$D\datetime.obj \ $(COMMDIR)\$D\datstrm.obj \ $(COMMDIR)\$D\db.obj \ @@ -163,6 +161,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\dobjcmn.obj \ $(COMMDIR)\$D\docmdi.obj \ $(COMMDIR)\$D\docview.obj \ + $(COMMDIR)\$D\dpycmn.obj \ $(COMMDIR)\$D\dseldlg.obj \ $(COMMDIR)\$D\dynarray.obj \ $(COMMDIR)\$D\dynlib.obj \ @@ -178,6 +177,8 @@ COMMONOBJS = \ $(COMMDIR)\$D\filefn.obj \ $(COMMDIR)\$D\filename.obj \ $(COMMDIR)\$D\filesys.obj \ + $(COMMDIR)\$D\fldlgcmn.obj \ + $(COMMDIR)\$D\fmapbase.obj \ $(COMMDIR)\$D\fontcmn.obj \ $(COMMDIR)\$D\fontmap.obj \ $(COMMDIR)\$D\framecmn.obj \ @@ -222,7 +223,6 @@ COMMONOBJS = \ $(COMMDIR)\$D\mstream.obj \ $(COMMDIR)\$D\nbkbase.obj \ $(COMMDIR)\$D\object.obj \ - $(COMMDIR)\$D\odbc.obj \ $(COMMDIR)\$D\paper.obj \ $(COMMDIR)\$D\popupcmn.obj \ $(COMMDIR)\$D\prntbase.obj \ @@ -231,7 +231,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\quantize.obj \ $(COMMDIR)\$D\radiocmn.obj \ $(COMMDIR)\$D\regex.obj \ - $(COMMDIR)\$D\resource.obj \ + $(COMMDIR)\$D\rgncmn.obj \ $(COMMDIR)\$D\sckaddr.obj \ $(COMMDIR)\$D\sckfile.obj \ $(COMMDIR)\$D\sckipc.obj \ @@ -240,10 +240,12 @@ COMMONOBJS = \ $(COMMDIR)\$D\sizer.obj \ $(COMMDIR)\$D\socket.obj \ $(COMMDIR)\$D\statbar.obj \ + $(COMMDIR)\$D\stopwatch.obj \ $(COMMDIR)\$D\strconv.obj \ $(COMMDIR)\$D\stream.obj \ $(COMMDIR)\$D\string.obj \ $(COMMDIR)\$D\sysopt.obj \ + $(COMMDIR)\$D\taskbarcmn.obj \ $(COMMDIR)\$D\tbarbase.obj \ $(COMMDIR)\$D\textbuf.obj \ $(COMMDIR)\$D\textcmn.obj \ @@ -263,14 +265,15 @@ COMMONOBJS = \ $(COMMDIR)\$D\wfstream.obj \ $(COMMDIR)\$D\wincmn.obj \ $(COMMDIR)\$D\wxchar.obj \ - $(COMMDIR)\$D\wxexpr.obj \ $(COMMDIR)\$D\xpmdecod.obj \ $(COMMDIR)\$D\zipstrm.obj \ $(COMMDIR)\$D\zstream.obj MSWOBJS = $(MSWDIR)\$D\accel.obj \ + $(OLEDIR)\$D\access.obj \ $(MSWDIR)\$D\app.obj \ $(OLEDIR)\$D\automtn.obj \ + $(MSWDIR)\$D\basemsw.obj \ $(MSWDIR)\$D\bitmap.obj \ $(MSWDIR)\$D\bmpbuttn.obj \ $(MSWDIR)\$D\brush.obj \ @@ -284,7 +287,6 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\colour.obj \ $(MSWDIR)\$D\combobox.obj \ $(MSWDIR)\$D\control.obj \ - $(MSWDIR)\$D\curico.obj \ $(MSWDIR)\$D\cursor.obj \ $(MSWDIR)\$D\data.obj \ $(OLEDIR)\$D\dataobj.obj \ @@ -297,9 +299,9 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\dialog.obj \ $(MSWDIR)\$D\dialup.obj \ $(MSWDIR)\$D\dib.obj \ - $(MSWDIR)\$D\dibutils.obj \ $(MSWDIR)\$D\dir.obj \ $(MSWDIR)\$D\dirdlg.obj \ + $(MSWDIR)\$D\display.obj \ $(MSWDIR)\$D\dragimag.obj \ $(OLEDIR)\$D\dropsrc.obj \ $(OLEDIR)\$D\droptgt.obj \ @@ -374,7 +376,9 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\treectrl.obj \ $(MSWDIR)\$D\utils.obj \ $(MSWDIR)\$D\utilsexc.obj \ + $(MSWDIR)\$D\utilsgui.obj \ $(OLEDIR)\$D\uuid.obj \ + $(MSWDIR)\$D\uxtheme.obj \ $(MSWDIR)\$D\volume.obj \ $(MSWDIR)\$D\wave.obj \ $(MSWDIR)\$D\window.obj @@ -405,7 +409,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \ # Add $(HTMLOBJS) if wanting wxHTML classes OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) -ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT) +ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT) SETUP_H=$(ARCHINCDIR)\wx\setup.h # Normal, static library @@ -535,7 +539,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) $(INCREMENTAL) -out:$(WXDIR)\lib\$(WXLIBNAME).dll - $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD) + $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD) << !endif @@ -563,9 +567,6 @@ $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp -<< - cl @<< -$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp @@ -581,9 +582,6 @@ $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp -<< - cl @<< -$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp @@ -635,7 +633,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@ png: cd $(WXDIR)\src\png - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 cd $(WXDIR)\src\msw clean_png: @@ -645,7 +643,7 @@ clean_png: zlib: cd $(WXDIR)\src\zlib - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 cd $(WXDIR)\src\msw clean_zlib: @@ -655,7 +653,7 @@ clean_zlib: jpeg: cd $(WXDIR)\src\jpeg - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all cd $(WXDIR)\src\msw clean_jpeg: @@ -665,7 +663,7 @@ clean_jpeg: tiff: cd $(WXDIR)\src\tiff - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all cd $(WXDIR)\src\msw clean_tiff: @@ -675,7 +673,7 @@ clean_tiff: regex: cd $(WXDIR)\src\regex - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all cd $(WXDIR)\src\msw clean_regex: @@ -689,11 +687,11 @@ rcparser: cd $(WXDIR)\src\msw cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk + -erase ..\..\lib\$(WXLIBNAME).dll + -erase ..\..\lib\$(WXLIBNAME).lib + -erase ..\..\lib\$(WXLIBNAME).exp + -erase ..\..\lib\$(WXLIBNAME).pdb + -erase ..\..\lib\$(WXLIBNAME).ilk clean: $(PERIPH_CLEAN_TARGET)