Fixed a typo in makefile.vc, updated version numbers in templates

(.DSPs were already up to date).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 983890a1648de5f1aee2e4b60cc74f4cc2b5d29e..f00b495df4d404f05b0051344af119dbfcceec16 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -92,7 +92,7 @@ PERIPH_CLEAN_TARGET=
 # Set to 0 if not using GLCanvas (only affects DLL build)
 USE_GLCANVAS=1
 
-# Set to 0 if you are using MSVC 5
+# Set to 1 if you are using MSVC 5
 USE_MSVC_5=0
 
 # These are absolute paths, so that the compiler
@@ -294,7 +294,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS) $(INCREMENTAL)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-    $(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)
+    $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.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

diff --git a/distrib/msw/tmake/vc6base.t b/distrib/msw/tmake/vc6base.t
index 959ff69fdc204a0583b20fc4d3c3804947343819..48a0d7424ae57125656b5e809bf3a1da3ec8b335 100644 (file)
--- a/distrib/msw/tmake/vc6base.t
+++ b/distrib/msw/tmake/vc6base.t
@@ -44,7 +44,7 @@
        $project{"WXMSWHEADERS"} .= $file . " "
     }
 
-    $project{"WXVERSION"} = "233";
+    $project{"WXVERSION"} = "250";
 #$}
 # Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

diff --git a/distrib/msw/tmake/vc6msw.t b/distrib/msw/tmake/vc6msw.t
index 84bd19f150fd1b6fb811ab0d88c555ae13ca5307..f2a114ff0faaf02d1a4bd0db60dc8e062f337659 100644 (file)
--- a/distrib/msw/tmake/vc6msw.t
+++ b/distrib/msw/tmake/vc6msw.t
@@ -60,7 +60,7 @@
        $project{"WXHTMLHEADERS"} .= $file . " "
     }
 
-    $project{"WXVERSION"} = "233";
+    $project{"WXVERSION"} = "250";
 #$}
 # Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 4e9d3b7adea1195df8db3f77cf20950ff701a45a..448b94cbfd7e014b888f3be56509fe58544d8296 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -35,7 +35,7 @@ PERIPH_CLEAN_TARGET=
 # Set to 0 if not using GLCanvas (only affects DLL build)
 USE_GLCANVAS=1
 
-# Set to 0 if you are using MSVC 5
+# Set to 1 if you are using MSVC 5
 USE_MSVC_5=0
 
 # These are absolute paths, so that the compiler