Clean up string table before uninitializing DDEML

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index f577adba32c3ff0c392f9ebe1713072f4ee7eab0..c4843def620ba3c229cc41b37b6a05100a247826 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:30, 2002/01/23
+# This file was automatically generated by tmake

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc


@@ -91,6 +91,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\calctrl.obj \
                $(GENDIR)\$D\choicdgg.obj \
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\calctrl.obj \
                $(GENDIR)\$D\choicdgg.obj \

+               $(GENDIR)\$D\dcbuffer.obj \

                $(GENDIR)\$D\dcpsg.obj \
                $(GENDIR)\$D\dirctrlg.obj \
                $(GENDIR)\$D\dragimgg.obj \
                $(GENDIR)\$D\dcpsg.obj \
                $(GENDIR)\$D\dirctrlg.obj \
                $(GENDIR)\$D\dragimgg.obj \


@@ -126,7 +127,6 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
                $(GENDIR)\$D\fontdlgg.obj \
                $(GENDIR)\$D\helpext.obj \
                $(GENDIR)\$D\helphtml.obj \
                $(GENDIR)\$D\fontdlgg.obj \
                $(GENDIR)\$D\helpext.obj \
                $(GENDIR)\$D\helphtml.obj \

-               $(GENDIR)\$D\helpwxht.obj \

                $(GENDIR)\$D\imaglist.obj \
                $(GENDIR)\$D\listctrl.obj \
                $(GENDIR)\$D\msgdlgg.obj \
                $(GENDIR)\$D\imaglist.obj \
                $(GENDIR)\$D\listctrl.obj \
                $(GENDIR)\$D\msgdlgg.obj \


@@ -136,6 +136,8 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
 COMMONOBJS = \
                $(COMMDIR)\$D\y_tab.obj \
                $(COMMDIR)\$D\appcmn.obj \
 COMMONOBJS = \
                $(COMMDIR)\$D\y_tab.obj \
                $(COMMDIR)\$D\appcmn.obj \

+               $(COMMDIR)\$D\artprov.obj \
+               $(COMMDIR)\$D\artstd.obj \

                $(COMMDIR)\$D\choiccmn.obj \
                $(COMMDIR)\$D\clipcmn.obj \
                $(COMMDIR)\$D\clntdata.obj \
                $(COMMDIR)\$D\choiccmn.obj \
                $(COMMDIR)\$D\clipcmn.obj \
                $(COMMDIR)\$D\clntdata.obj \


@@ -186,11 +188,14 @@ COMMONOBJS = \
                $(COMMDIR)\$D\geometry.obj \
                $(COMMDIR)\$D\gifdecod.obj \
                $(COMMDIR)\$D\hash.obj \
                $(COMMDIR)\$D\geometry.obj \
                $(COMMDIR)\$D\gifdecod.obj \
                $(COMMDIR)\$D\hash.obj \

+               $(COMMDIR)\$D\hashmap.obj \

                $(COMMDIR)\$D\helpbase.obj \
                $(COMMDIR)\$D\http.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\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 \
                $(COMMDIR)\$D\imaggif.obj \
                $(COMMDIR)\$D\imagiff.obj \
                $(COMMDIR)\$D\imagjpeg.obj \


@@ -211,6 +216,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\menucmn.obj \
                $(COMMDIR)\$D\mimecmn.obj \
                $(COMMDIR)\$D\module.obj \
                $(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 \
                $(COMMDIR)\$D\mstream.obj \
                $(COMMDIR)\$D\nbkbase.obj \
                $(COMMDIR)\$D\object.obj \


@@ -228,6 +234,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\sckfile.obj \
                $(COMMDIR)\$D\sckipc.obj \
                $(COMMDIR)\$D\sckstrm.obj \
                $(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 \
                $(COMMDIR)\$D\sizer.obj \
                $(COMMDIR)\$D\socket.obj \
                $(COMMDIR)\$D\statbar.obj \


@@ -314,6 +321,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\helpwin.obj \
                $(MSWDIR)\$D\icon.obj \
                $(MSWDIR)\$D\imaglist.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 \
                $(MSWDIR)\$D\joystick.obj \
                $(MSWDIR)\$D\listbox.obj \
                $(MSWDIR)\$D\listctrl.obj \


@@ -325,6 +333,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\mimetype.obj \
                $(MSWDIR)\$D\minifram.obj \
                $(MSWDIR)\$D\msgdlg.obj \
                $(MSWDIR)\$D\mimetype.obj \
                $(MSWDIR)\$D\minifram.obj \
                $(MSWDIR)\$D\msgdlg.obj \

+               $(MSWDIR)\$D\mslu.obj \

                $(MSWDIR)\$D\nativdlg.obj \
                $(MSWDIR)\$D\notebook.obj \
                $(OLEDIR)\$D\oleutils.obj \
                $(MSWDIR)\$D\nativdlg.obj \
                $(MSWDIR)\$D\notebook.obj \
                $(OLEDIR)\$D\oleutils.obj \


@@ -332,6 +341,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\palette.obj \
                $(MSWDIR)\$D\pen.obj \
                $(MSWDIR)\$D\penwin.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 \
                $(MSWDIR)\$D\printdlg.obj \
                $(MSWDIR)\$D\printwin.obj \
                $(MSWDIR)\$D\radiobox.obj \


@@ -363,6 +373,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\utils.obj \
                $(MSWDIR)\$D\utilsexc.obj \
                $(OLEDIR)\$D\uuid.obj \
                $(MSWDIR)\$D\utils.obj \
                $(MSWDIR)\$D\utilsexc.obj \
                $(OLEDIR)\$D\uuid.obj \

+               $(MSWDIR)\$D\volume.obj \

                $(MSWDIR)\$D\wave.obj \
                $(MSWDIR)\$D\window.obj
 
                $(MSWDIR)\$D\wave.obj \
                $(MSWDIR)\$D\window.obj
 


@@ -446,18 +457,18 @@ $(WXDIR)\$D:
 
 # wxWindows library as DLL
 dll:
 
 # 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:
 
 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:
 
 # 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:
 
 # 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
 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to


@@ -523,7 +534,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS) $(INCREMENTAL)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
     $(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 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)

 <<
 
 !endif
 <<
 
 !endif


@@ -734,23 +745,22 @@ docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp

-refhlp: $(DOCDIR)/winhelp/techref.hlp

 rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf

-refpdfrtf: $(DOCDIR)/pdf/techref.rtf

 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm

-ps:     wxps referencps
+ps:     wxps

 wxps:  $(WXDIR)\docs\ps\wx.ps
 wxps:  $(WXDIR)\docs\ps\wx.ps

-referencps:    $(WXDIR)\docs\ps\referenc.ps

 
 allhlp: wxhlp
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc hlp
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc hlp
 
 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)
 
 allhtml: wxhtml
         cd $(THISDIR)
 
 allhtml: wxhtml


@@ -758,6 +768,7 @@ allhtml: wxhtml
         nmake -f makefile.vc html
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc html
         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 $(THISDIR)
 
 allhtmlhelp: htmlhelp


@@ -765,6 +776,8 @@ allhtmlhelp: htmlhelp
         nmake -f makefile.vc htmlhelp
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc htmlhelp
         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 $(THISDIR)
 
 allhtb: htb


@@ -772,6 +785,8 @@ allhtb: htb
         nmake -f makefile.vc htb
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc htb
         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 $(THISDIR)
 
 allps: wxps referencps


@@ -779,6 +794,8 @@ allps: wxps referencps
         nmake -f makefile.vc ps
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc ps
         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 $(THISDIR)
 
 allpdfrtf: pdfrtf


@@ -786,6 +803,8 @@ allpdfrtf: pdfrtf
         nmake -f makefile.vc pdfrtf
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc pdfrtf
         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 $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj


@@ -798,24 +817,11 @@ $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
 
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
 

-$(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
-        cd $(DOCDIR)/latex/techref
-        -erase techref.ph
-        hc techref
-        move techref.hlp $(DOCDIR)\winhelp\techref.hlp
-        move techref.cnt $(DOCDIR)\winhelp\techref.cnt
-        cd $(THISDIR)
-

 $(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 
 $(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 

-$(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
-        cd $(DOCDIR)\latex\techref
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
-        cd $(THISDIR)
-

 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -copy *.wmf $(DOCDIR)\pdf
 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -copy *.wmf $(DOCDIR)\pdf


@@ -823,13 +829,6 @@ $(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)
 
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         cd $(THISDIR)
 

-$(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
-        cd $(DOCDIR)\latex\techref
-        -copy *.wmf $(DOCDIR)\pdf
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
-        cd $(THISDIR)
-

 $(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
 $(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