X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2417bf69de4c386d0a532b9727e79f677d2869ec..9750481f368dceba820004ab479d31deb4860253:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1fcb1fffc4..c6a6c8fd54 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
@@ -124,17 +124,20 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
 # 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 \
 		$(GENDIR)\$D\msgdlgg.obj \
 		$(GENDIR)\$D\notebook.obj \
 		$(GENDIR)\$D\tabg.obj
 
 COMMONOBJS = \
 		$(COMMDIR)\$D\y_tab.obj \
+		$(COMMDIR)\$D\accesscmn.obj \
 		$(COMMDIR)\$D\appcmn.obj \
 		$(COMMDIR)\$D\artprov.obj \
 		$(COMMDIR)\$D\artstd.obj \
@@ -161,6 +164,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 \
@@ -195,6 +199,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\imagall.obj \
 		$(COMMDIR)\$D\imagbmp.obj \
 		$(COMMDIR)\$D\image.obj \
+		$(COMMDIR)\$D\imagfill.obj \
 		$(COMMDIR)\$D\imaggif.obj \
 		$(COMMDIR)\$D\imagiff.obj \
 		$(COMMDIR)\$D\imagjpeg.obj \
@@ -215,6 +220,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\menucmn.obj \
 		$(COMMDIR)\$D\mimecmn.obj \
 		$(COMMDIR)\$D\module.obj \
+		$(COMMDIR)\$D\msgout.obj \
 		$(COMMDIR)\$D\mstream.obj \
 		$(COMMDIR)\$D\nbkbase.obj \
 		$(COMMDIR)\$D\object.obj \
@@ -232,6 +238,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\sckfile.obj \
 		$(COMMDIR)\$D\sckipc.obj \
 		$(COMMDIR)\$D\sckstrm.obj \
+		$(COMMDIR)\$D\settcmn.obj \
 		$(COMMDIR)\$D\sizer.obj \
 		$(COMMDIR)\$D\socket.obj \
 		$(COMMDIR)\$D\statbar.obj \
@@ -264,6 +271,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\zstream.obj
 
 MSWOBJS = $(MSWDIR)\$D\accel.obj \
+		$(OLEDIR)\$D\access.obj \
 		$(MSWDIR)\$D\app.obj \
 		$(OLEDIR)\$D\automtn.obj \
 		$(MSWDIR)\$D\bitmap.obj \
@@ -292,9 +300,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 \
@@ -318,6 +326,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\helpwin.obj \
 		$(MSWDIR)\$D\icon.obj \
 		$(MSWDIR)\$D\imaglist.obj \
+		$(MSWDIR)\$D\iniconf.obj \
 		$(MSWDIR)\$D\joystick.obj \
 		$(MSWDIR)\$D\listbox.obj \
 		$(MSWDIR)\$D\listctrl.obj \
@@ -337,6 +346,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\palette.obj \
 		$(MSWDIR)\$D\pen.obj \
 		$(MSWDIR)\$D\penwin.obj \
+		$(MSWDIR)\$D\popupwin.obj \
 		$(MSWDIR)\$D\printdlg.obj \
 		$(MSWDIR)\$D\printwin.obj \
 		$(MSWDIR)\$D\radiobox.obj \
@@ -388,7 +398,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 \
@@ -399,7 +408,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
@@ -529,7 +538,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
@@ -629,7 +638,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:
@@ -639,7 +648,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:
@@ -649,7 +658,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:
@@ -659,7 +668,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:
@@ -669,7 +678,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:
@@ -683,11 +692,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)
@@ -824,19 +833,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