corrections for Mac OS X

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 60b01a0e9193ae2ca5c0bb8ae9be1b894e8e449f..297b4118c6e0e14dc9c288d0eae87c43e10f14a0 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:46, 2000/04/27
+# This file was automatically generated by tmake at 19:20, 2001/02/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -94,19 +94,20 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\logg.obj \
                ..\generic\$D\numdlgg.obj \
                ..\generic\$D\panelg.obj \
-               ..\generic\$D\plot.obj \
                ..\generic\$D\progdlgg.obj \
                ..\generic\$D\prop.obj \
                ..\generic\$D\propform.obj \
                ..\generic\$D\proplist.obj \
                ..\generic\$D\sashwin.obj \
                ..\generic\$D\scrolwin.obj \
+               ..\generic\$D\splash.obj \
                ..\generic\$D\splitter.obj \
                ..\generic\$D\statusbr.obj \
-               ..\generic\$D\tabg.obj \
                ..\generic\$D\tbarsmpl.obj \
                ..\generic\$D\textdlgg.obj \
                ..\generic\$D\tipdlg.obj \
+               ..\generic\$D\tipwin.obj \
+               ..\generic\$D\treectlg.obj \
                ..\generic\$D\treelay.obj \
                ..\generic\$D\wizard.obj
 
@@ -129,7 +130,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
                ..\generic\$D\statline.obj \
-               ..\generic\$D\treectrl.obj
+               ..\generic\$D\tabg.obj
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \
@@ -139,6 +140,7 @@ COMMONOBJS = \
                ..\common\$D\cmdline.obj \
                ..\common\$D\cmndata.obj \
                ..\common\$D\config.obj \
+               ..\common\$D\cshelp.obj \
                ..\common\$D\ctrlcmn.obj \
                ..\common\$D\ctrlsub.obj \
                ..\common\$D\datetime.obj \
@@ -153,6 +155,7 @@ COMMONOBJS = \
                ..\common\$D\docview.obj \
                ..\common\$D\dynarray.obj \
                ..\common\$D\dynlib.obj \
+               ..\common\$D\effects.obj \
                ..\common\$D\encconv.obj \
                ..\common\$D\event.obj \
                ..\common\$D\extended.obj \
@@ -160,6 +163,7 @@ COMMONOBJS = \
                ..\common\$D\file.obj \
                ..\common\$D\fileconf.obj \
                ..\common\$D\filefn.obj \
+               ..\common\$D\filename.obj \
                ..\common\$D\filesys.obj \
                ..\common\$D\fontcmn.obj \
                ..\common\$D\fontmap.obj \
@@ -190,6 +194,7 @@ COMMONOBJS = \
                ..\common\$D\list.obj \
                ..\common\$D\log.obj \
                ..\common\$D\longlong.obj \
+               ..\common\$D\matrix.obj \
                ..\common\$D\memory.obj \
                ..\common\$D\menucmn.obj \
                ..\common\$D\mimecmn.obj \
@@ -202,6 +207,7 @@ COMMONOBJS = \
                ..\common\$D\prntbase.obj \
                ..\common\$D\process.obj \
                ..\common\$D\protocol.obj \
+               ..\common\$D\quantize.obj \
                ..\common\$D\resource.obj \
                ..\common\$D\sckaddr.obj \
                ..\common\$D\sckfile.obj \
@@ -218,6 +224,7 @@ COMMONOBJS = \
                ..\common\$D\textfile.obj \
                ..\common\$D\timercmn.obj \
                ..\common\$D\tokenzr.obj \
+               ..\common\$D\treebase.obj \
                ..\common\$D\txtstrm.obj \
                ..\common\$D\unzip.obj \
                ..\common\$D\url.obj \
@@ -324,6 +331,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\taskbar.obj \
                ..\msw\$D\tbar95.obj \
                ..\msw\$D\textctrl.obj \
+               ..\msw\$D\tglbtn.obj \
                ..\msw\$D\thread.obj \
                ..\msw\$D\timer.obj \
                ..\msw\$D\tooltip.obj \
@@ -362,7 +370,12 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
-all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+
+setuph:
+    cd $(WXDIR)\include\wx\msw
+    if not exist setup.h copy setup0.h setup.h
+    cd $(WXDIR)\src\msw
 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 
@@ -442,7 +455,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 
 !if "$(USE_GLCANVAS)" == "1"
 GL_LIBS=opengl32.lib glu32.lib
-GL_LIBS_DELAY=/delayload:opengl32.dll
+# GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif
 
 # Update the dynamic link library
@@ -454,11 +467,12 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
        delayimp.lib
        /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
        /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
-       /delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll $(GL_LIBS_DELAY)
+       /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
 <<
 
 !endif
 
+# /delayload:winmm.dll # Removed because it can cause a crash for some people
 
 ########################################################
 # Windows-specific objects
@@ -681,42 +695,11 @@ allhlp: wxhlp
         nmake -f makefile.vc hlp
         cd $(THISDIR)
 
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxbuild\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxgrid\src
-#        nmake -f makefile.vc hlp
-
 allhtml: wxhtml
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc html
         cd $(THISDIR)
 
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\dialoged\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\hytext\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc html
-
 allps: wxps referencps
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
@@ -727,22 +710,12 @@ allpdfrtf: pdfrtf
         nmake -f makefile.vc pdfrtf
         cd $(THISDIR)
 
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc ps
-#        cd $(THISDIR)
-
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
         -erase wx.ph
         hc wx
+        -erase $(DOCDIR)\winhelp\wx.hlp
+        -erase $(DOCDIR)\winhelp\wx.cnt
         move wx.hlp $(DOCDIR)\winhelp\wx.hlp
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
@@ -794,6 +767,7 @@ $(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
        cd $(DOCDIR)\html\wx
        -hhc wx.hhp
     -mkdir ..\..\htmlhelp
+    -erase $(DOCDIR)\htmlhelp\wx.chm
     move wx.chm ..\..\htmlhelp
        cd $(THISDIR)
 
@@ -835,8 +809,8 @@ $(WXDIR)\docs\ps\referenc.ps:       $(WXDIR)\docs\latex\wx\referenc.dvi
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
 $(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm
        cd $(WXDIR)\docs\html\wx
-    -erase /Y wx.zip wx.htb
-    zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -erase wx.zip wx.htb
+    zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk
     -mkdir $(DOCDIR)\htb
     move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
@@ -848,11 +822,14 @@ touchmanual:
 updatedocs: touchmanual alldocs
 
 cleandocs:
-    -erase /Y $(DOCDIR)\html\wx\wx.htm
-    -erase /Y $(DOCDIR)\pdf\wx.rtf
-    -erase /Y $(DOCDIR)\latex\wx\wx.rtf
-    -erase /Y $(DOCDIR)\htmlhelp\wx.chm
-    -erase /Y $(DOCDIR)\htb\wx.htb
+    -erase $(DOCDIR)\winhelp\wx.hlp
+    -erase $(DOCDIR)\winhelp\wx.cnt
+    -erase $(DOCDIR)\html\wx\*.htm
+    -erase $(DOCDIR)\pdf\wx.rtf
+    -erase $(DOCDIR)\latex\wx\wx.rtf
+    -erase $(DOCDIR)\latex\wx\WX.PH
+    -erase $(DOCDIR)\htmlhelp\wx.chm
+    -erase $(DOCDIR)\htb\wx.htb
 
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.