compilation fix for WXWIN_COMPATIBILITY_2 == 1

[wxWidgets.git] / src / msw / makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 3a9008760aaff0b70febc3d9be8a07d105262669..448b94cbfd7e014b888f3be56509fe58544d8296 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake 
+# This file was automatically generated by tmake
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     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,11 +124,13 @@ 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
@@ -191,9 +193,11 @@ COMMONOBJS = \
                $(COMMDIR)\$D\hashmap.obj \
                $(COMMDIR)\$D\helpbase.obj \
                $(COMMDIR)\$D\http.obj \
+               $(COMMDIR)\$D\iconbndl.obj \
                $(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 \
@@ -214,6 +218,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 \
@@ -231,6 +236,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 \
@@ -317,6 +323,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 \
@@ -336,6 +343,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 \
@@ -387,7 +395,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 \
@@ -451,18 +458,18 @@ $(WXDIR)\$D:
 
 # wxWindows library as DLL
 dll:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 cleandll:
-        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # wxWindows + app as DLL. Only affects main.cpp.
 dllapp:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # wxWindows + app as DLL, for Netscape plugin - remove DllMain.
 dllnp:
-        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to
@@ -528,7 +535,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS) $(INCREMENTAL)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-    $(DUMMYOBJ) $(OBJECTS) $(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
@@ -823,19 +830,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