ABX's changes to support MGL

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

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index 42e7a48e52e38d8aeb9c0b2e39208dce4bb2850c..babe823e1dfbf3485c0d66763d107a3b0d7aaeae 100644 (file)
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -8,7 +8,7 @@
     the library.
     -->
 
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW' and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index bb797f24bccf7c732d4e86f19714776ab2662ded..3da1ea4621accf9377d0114edcf7d3e90d7c3181 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -416,7 +416,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <libname>$(WXLIBNAME)</libname>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf'">
+            <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
                 <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
                 <precomp-headers-gen>
                     $(WXTOPDIR)src/msw/dummy.cpp

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 23a9c24b901086075a2342d7ed1ee1a0901574bd..4a0c65b716432f086f2a32c956b7205a4e49a36d 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -244,7 +244,7 @@ it if SHARED=1 unless you know what you are doing.
         
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
 
-        <set var="TOOLKIT">
+        <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT!='msevc4prj'">MSW</if>
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
         </set>

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 2a4dcd76a405d337d9de0a582a708a9b5be9dfc5..de9ddd31cce3ab80347898c2471c2918b77d7c3b 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -25,6 +25,7 @@
         <libname>$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
+        <define>__WX$(TOOLKIT)__</define>
         <define>$(UNICODE_DEFINE)</define>
         <dirname>$(LIBDIRNAME)</dirname>
         <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 0f734f574fc746d747c53800811e205330c0df11..56866d9f743ce4c8dc3e4b493485d61772b6d0fc 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -40,7 +40,7 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
     </subproject>
 
     <if cond="FORMAT=='autoconf'">       
@@ -140,8 +140,8 @@
     </if>
 
 
-    <!-- copy setup.h on Windows: -->    
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+    <!-- copy setup.h on DOS/Windows: -->    
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
@@ -157,7 +157,7 @@
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0'">msw</if>
+            <if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
         </set>
         
         <copy-file-to-file-if-not-exist id="master_setup.h">