Make TOOLKIT variable constant in MSW makefiles.

This fixes duplicate lines defining rules for generic files for more than one
port in the makefiles.

Closes #14979.

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

build/bakefiles/config.bkl

@@ -66,7 +66,8 @@
             </option>
         </if>
 
-        <if cond="FORMAT in ['msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
+        <!-- We must make TOOLKIT a constant under MSW -->
+        <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
             <set var="TOOLKIT">MSW</set>
         </if>
     </if>

build/msw/config.bcc

@@ -50,11 +50,6 @@ CPP = cpp32 -Sr -oCON
 SHARED = 0
 !endif
 
-# Used toolkit [MSW,GTK]
-!ifndef TOOLKIT
-TOOLKIT = MSW
-!endif
-
 # GTK+ toolkit version [,2]
 !ifndef TOOLKIT_VERSION
 TOOLKIT_VERSION = 

build/msw/config.gcc

@@ -40,9 +40,6 @@ CPP ?= $(CC) -E
 # What type of library to build? [0,1]
 SHARED ?= 0
 
-# Used toolkit [MSW,GTK]
-TOOLKIT ?= MSW
-
 # GTK+ toolkit version [,2]
 TOOLKIT_VERSION ?= 
 

build/msw/config.vc

@@ -34,9 +34,6 @@ CPP = $(CC) /EP /nologo
 # What type of library to build? [0,1]
 SHARED = 0
 
-# Used toolkit [MSW,GTK]
-TOOLKIT = MSW
-
 # GTK+ toolkit version [,2]
 TOOLKIT_VERSION = 
 

build/msw/config.wat

@@ -35,10 +35,6 @@ CPP = $(CC) -p
 #   1 - DLL
 SHARED = 0
 
-# Used toolkit [MSW,GTK]
-#   GTK - GTK+
-TOOLKIT = MSW
-
 # GTK+ toolkit version [,2]
 TOOLKIT_VERSION = 
 

build/msw/wx_core.dsp

@@ -3613,3 +3613,4 @@ SOURCE=..\..\src\xrc\xmlreshandler.cpp
 # End Group
 # End Target
 # End Project
+