gtk 1.2.8 compilation fix

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index f3a5e7e3674869797533e9b1205082c597b61711..60b01a0e9193ae2ca5c0bb8ae9be1b894e8e449f 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:20, 2000/03/17
+# This file was automatically generated by tmake at 10:46, 2000/04/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -27,11 +27,6 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif
 
-USE_GLCANVAS=1
-
-# Please set these according to the settings in setup.h, so we can include
-# the appropriate libraries in wx.lib
-
 # This one overrides the others, to be consistent with the settings in setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
@@ -39,6 +34,9 @@ PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
+# Set to 0 if not using GLCanvas (only affects DLL build)
+USE_GLCANVAS=1
+
 # These are absolute paths, so that the compiler
 # generates correct __FILE__ symbols for debugging.
 # Otherwise you don't be able to double-click on a memory
@@ -88,6 +86,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\calctrl.obj \
                ..\generic\$D\choicdgg.obj \
+               ..\generic\$D\dirctrlg.obj \
                ..\generic\$D\dragimgg.obj \
                ..\generic\$D\grid.obj \
                ..\generic\$D\gridsel.obj \
@@ -104,6 +103,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\scrolwin.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 \
@@ -129,7 +129,6 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
                ..\generic\$D\statline.obj \
-               ..\generic\$D\tabg.obj \
                ..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
@@ -282,6 +281,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\glcanvas.obj \
                ..\msw\$D\gsocket.obj \
                ..\msw\$D\gsockmsw.obj \
+               ..\msw\$D\helpchm.obj \
                ..\msw\$D\helpwin.obj \
                ..\msw\$D\icon.obj \
                ..\msw\$D\imaglist.obj \
@@ -442,6 +442,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 
 !if "$(USE_GLCANVAS)" == "1"
 GL_LIBS=opengl32.lib glu32.lib
+GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif
 
 # Update the dynamic link library
@@ -450,6 +451,10 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(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
+       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)
 <<
 
 !endif
@@ -467,7 +472,7 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<
 
 # Compile certain files with no optimization (some files cause a
-# compiler crash for buggy versions of VC++, e.g. 4.0)
+# compiler crash for buggy versions of VC++, e.g. 4.0).
 # Don't forget to put FINAL=1 on the command line.
 noopt:
        cl @<<
@@ -655,7 +660,7 @@ clean: $(PERIPH_CLEAN_TARGET)
 
 
 # Making documents
-docs:   allhlp allhtml allpdfrtf
+docs:   allhlp allhtml allpdfrtf htb htmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
@@ -664,8 +669,9 @@ 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)\html\wx\wx.chm
+htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps referencps
 wxps:  $(WXDIR)\docs\ps\wx.ps
 referencps:    $(WXDIR)\docs\ps\referenc.ps
@@ -776,6 +782,7 @@ $(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
 $(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
         -erase $(DOCDIR)\html\wx\*.con
         -erase $(DOCDIR)\html\wx\*.ref
@@ -783,9 +790,11 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
        cd $(DOCDIR)\html\wx
        -hhc wx.hhp
+    -mkdir ..\..\htmlhelp
+    move wx.chm ..\..\htmlhelp
        cd $(THISDIR)
 
 $(WXDIR)\docs\latex\wx\manual.dvi:     $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
@@ -824,11 +833,12 @@ $(WXDIR)\docs\ps\referenc.ps:     $(WXDIR)\docs\latex\wx\referenc.dvi
 # files, renamed to htb.
 # This can then be used with e.g. helpview.
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-htb:
+$(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
-    ren wx.zip wx.htb
+    -mkdir $(DOCDIR)\htb
+    move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
 
 # In order to force document reprocessing
@@ -837,6 +847,13 @@ 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
+
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 updatepdf:  # touchmanual pdfrtf