X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b089c5e8c8a2140258d150ca1ce42afd3b79e1b..3711412e38576634a4d050ecd362f3f341ac5b4f:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 3ceaa58c47..4267138743 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:17, 2000/02/27
+# This file was automatically generated by tmake at 11:20, 2000/03/17
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -86,7 +86,9 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\calctrl.obj \
 		..\generic\$D\choicdgg.obj \
+		..\generic\$D\dragimgg.obj \
 		..\generic\$D\grid.obj \
+		..\generic\$D\gridsel.obj \
 		..\generic\$D\laywin.obj \
 		..\generic\$D\logg.obj \
 		..\generic\$D\numdlgg.obj \
@@ -103,6 +105,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\tbarsmpl.obj \
 		..\generic\$D\textdlgg.obj \
 		..\generic\$D\tipdlg.obj \
+		..\generic\$D\treelay.obj \
 		..\generic\$D\wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
@@ -276,6 +279,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
 		..\msw\$D\gdiobj.obj \
 		..\msw\$D\glcanvas.obj \
 		..\msw\$D\gsocket.obj \
+		..\msw\$D\gsockmsw.obj \
 		..\msw\$D\helpwin.obj \
 		..\msw\$D\icon.obj \
 		..\msw\$D\imaglist.obj \
@@ -437,12 +441,16 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).lib
 <<
 
+!if "$(USE_GLCANVAS)" == "1"
+GL_LIBS=opengl32.lib glu32.lib
+!endif
+
 # Update the dynamic link library
 $(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 $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.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\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
 <<
 
 !endif
@@ -470,6 +478,9 @@ $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp
 <<
 	cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp
+<<
+	cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp
 <<
 	cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp
@@ -482,6 +493,9 @@ $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp
 <<
 	cl @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp
+<<
+	cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp
 <<
 	cl @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp
@@ -602,14 +616,17 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
-        -erase $(LIBTARGET)
-        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
+cleanall: clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
+
+
+clean: $(PERIPH_CLEAN_TARGET)
+        -erase $(LIBTARGET)
+        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
@@ -636,7 +653,6 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_ti
         -rmdir ..\common\$(D)
         -rmdir ..\html\$(D)
 
-cleanall: clean
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf
@@ -804,6 +820,17 @@ $(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
         move referenc.ps $(WXDIR)\docs\ps\referenc.ps
         cd $(THISDIR)
 
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# 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:
+	cd $(WXDIR)\docs\html\wx
+    -erase /Y wx.zip wx.htb
+    zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
+    ren wx.zip wx.htb
+    cd $(THISDIR)
+
 # In order to force document reprocessing
 touchmanual:
     -touch $(WXDIR)\docs\latex\wx\manual.tex