some more src code reformatting

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 066d62dc8feb7dc70ee92236e605e268fd4515ce..e3b0479255bf45f61e38b0ce078e694e188cd228 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 00:44, 2001/05/09
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -27,6 +27,9 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif
 
+# This one overrides the others, to be consistent with the settings in setup.h
+MINIMAL_WXWINDOWS_SETUP=0
+
 PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
@@ -91,7 +94,6 @@ 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 \
@@ -101,10 +103,11 @@ GENERICOBJS= ..\generic\$D\busyinfo.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
 
@@ -124,10 +127,11 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\listctrl.obj \
                ..\generic\$D\msgdlgg.obj \
                ..\generic\$D\notebook.obj \
+               ..\generic\$D\paletteg.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
                ..\generic\$D\statline.obj \
-               ..\generic\$D\treectlg.obj
+               ..\generic\$D\tabg.obj
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \
@@ -137,6 +141,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 \
@@ -159,6 +164,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 \
@@ -182,6 +188,7 @@ COMMONOBJS = \
                ..\common\$D\imagpng.obj \
                ..\common\$D\imagpnm.obj \
                ..\common\$D\imagtiff.obj \
+               ..\common\$D\imagxpm.obj \
                ..\common\$D\intl.obj \
                ..\common\$D\ipcbase.obj \
                ..\common\$D\layout.obj \
@@ -189,6 +196,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 \
@@ -231,6 +239,7 @@ COMMONOBJS = \
                ..\common\$D\wincmn.obj \
                ..\common\$D\wxchar.obj \
                ..\common\$D\wxexpr.obj \
+               ..\common\$D\xpmdecod.obj \
                ..\common\$D\zipstrm.obj \
                ..\common\$D\zstream.obj
 
@@ -325,6 +334,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 \
@@ -333,8 +343,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\utilsexc.obj \
                ..\msw\ole\$D\uuid.obj \
                ..\msw\$D\wave.obj \
-               ..\msw\$D\window.obj \
-               ..\msw\$D\xpmhand.obj
+               ..\msw\$D\window.obj
 
 HTMLOBJS = ..\html\$D\helpctrl.obj \
                ..\html\$D\helpdata.obj \
@@ -363,10 +372,14 @@ 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 jpeg tiff $(LIBTARGET)
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+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
 
 $D:
     mkdir $D
@@ -443,7 +456,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
@@ -451,7 +464,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -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\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
+    $(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
        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
@@ -538,16 +551,6 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
 $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
 <<
 
-# If taking wxWindows from CVS, setup.h doesn't exist yet.
-# Actually the 'if not exist setup.h' test doesn't work
-# (copies the file anyway)
-# we'll have to comment this rule out.
-
-# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
-#    cd "$(WXDIR)"\include\wx\msw
-#    if not exist setup.h copy setup0.h setup.h
-#    cd "$(WXDIR)"\src\msw
-
 ..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
         cl @<<
 $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
@@ -608,22 +611,12 @@ clean_tiff:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
-xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
-    cd $(WXDIR)\src\msw
-
-clean_xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.vc clean
-    cd $(WXDIR)\src\msw
-
 rcparser:
     cd $(WXDIR)\utils\rcparser\src
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
+cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
@@ -660,9 +653,8 @@ clean: $(PERIPH_CLEAN_TARGET)
         -rmdir ..\common\$(D)
         -rmdir ..\html\$(D)
 
-
 # Making documents
-docs:   allhlp allhtml allpdfrtf htb htmlhelp
+docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
@@ -681,70 +673,51 @@ 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
         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 $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc html
+        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 $(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
+allhtb: htb
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc htb
+        cd $(WXDIR)\utils\tex2rtf\src
+        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 $(THISDIR)
 
 allpdfrtf: pdfrtf
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc pdfrtf
+        cd $(WXDIR)\utils\tex2rtf\src
+        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)
@@ -796,6 +769,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)
 
@@ -837,8 +811,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)
@@ -850,11 +824,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.