X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/841346f01f8899ae6d83eb7e39dc303a4bf8df84..178edd2a3267f1d80b3f1a9f96717d66c12c10be:/src/msw/makefile.vc?ds=sidebyside

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index dfca461644..bae4d983f8 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,16 +115,15 @@ 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,
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
 		$(GENDIR)\$D\dirdlgg.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 \
@@ -135,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 \
@@ -150,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 \
@@ -162,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 \
@@ -177,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 \
@@ -221,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 \
@@ -230,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 \
@@ -239,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 \
@@ -262,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 \
@@ -283,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 \
@@ -296,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 \
@@ -373,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
@@ -394,7 +399,6 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 		$(HTMLDIR)\$D\m_layout.obj \
 		$(HTMLDIR)\$D\m_links.obj \
 		$(HTMLDIR)\$D\m_list.obj \
-		$(HTMLDIR)\$D\m_meta.obj \
 		$(HTMLDIR)\$D\m_pre.obj \
 		$(HTMLDIR)\$D\m_style.obj \
 		$(HTMLDIR)\$D\m_tables.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
@@ -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)
@@ -756,57 +754,63 @@ ps:     wxps
 wxps:	$(WXDIR)\docs\ps\wx.ps
 
 allhlp: wxhlp
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc hlp
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc hlp
-        cd $(WXDIR)\contrib\src\fl
-        nmake -f makefile.vc hlp
-        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\contrib\src\fl
+#        nmake -f makefile.vc hlp
+#        cd $(THISDIR)
 
 allhtml: wxhtml
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc html
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc html
-        cd $(WXDIR)\contrib\src\fl
-        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\contrib\src\fl
+#        cd $(THISDIR)
 
 allhtmlhelp: htmlhelp
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc htmlhelp
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc htmlhelp
-        cd $(WXDIR)\contrib\src\fl
-        nmake -f makefile.vc htmlhelp
-        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc htmlhelp
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc htmlhelp
+#        cd $(WXDIR)\contrib\src\fl
+#        nmake -f makefile.vc htmlhelp
+#        cd $(THISDIR)
 
 allhtb: htb
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc htb
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc htb
-        cd $(WXDIR)\contrib\src\fl
-        nmake -f makefile.vc htb
-        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc htb
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc htb
+#        cd $(WXDIR)\contrib\src\fl
+#        nmake -f makefile.vc htb
+#        cd $(THISDIR)
 
 allps: wxps referencps
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc ps
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc ps
-        cd $(WXDIR)\contrib\src\fl
-        nmake -f makefile.vc ps
-        cd $(THISDIR)
+ 
+#       cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\contrib\src\fl
+#        nmake -f makefile.vc ps
+#        cd $(THISDIR)
 
 allpdfrtf: pdfrtf
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc pdfrtf
-        cd $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc pdfrtf
-        cd $(WXDIR)\contrib\src\fl
-        nmake -f makefile.vc pdfrtf
-        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc pdfrtf
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc pdfrtf
+#        cd $(WXDIR)\contrib\src\fl
+#        nmake -f makefile.vc pdfrtf
+#        cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
@@ -830,19 +834,26 @@ $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         cd $(THISDIR)
 
+# This target does two sets of HTML: one using a style sheet, for
+# the purposes of the CHM file, and one without.
 $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         copy *.gif $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
+        -mkdir $(DOCDIR)\mshtml
+        -mkdir $(DOCDIR)\mshtml\wx
+        copy *.gif $(DOCDIR)\mshtml\wx
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\mshtml\wx\wx.htm -twice -html -macros $(DOCDIR)\latex\wx\tex2rtf_css.ini
         -erase $(DOCDIR)\html\wx\*.con
         -erase $(DOCDIR)\html\wx\*.ref
         -erase $(DOCDIR)\latex\wx\*.con
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
-	cd $(DOCDIR)\html\wx
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
+	cd $(DOCDIR)\mshtml\wx
+    copy $(DOCDIR)\latex\wx\wx.css .
 	-hhc wx.hhp
     -mkdir ..\..\htmlhelp
     -erase $(DOCDIR)\htmlhelp\wx.chm