X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb9548d9a79312de7726a437a5a67e48e8093863..bd018e7e31361bc2112a386f18663908a0559d58:/build/bakefiles/common.bkl?ds=sidebyside

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 6b1038d6f7..bebeca6399 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -2,41 +2,71 @@
 <!-- $Id$ -->
 
 <makefile>
-    
+
+    <requires version="0.1.7"/>
+
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
 
     <!-- load python module with wxwindows helpers: -->
     <using module="wxwin"/>
 
+    <!-- DFE: Add a platform meaning regular MacOS (not OS X) -->
+    <!-- FIXME: This will be handled in Bakefile but for now I wanted to
+         get my changes to the wx bakefiles in the tree but invisible to
+         windows toolkits and their config.xxx settings -->
+    <if cond="FORMAT=='autoconf'">
+        <option name="PLATFORM_MACOS"/>
+    </if>
+    <if cond="FORMAT!='autoconf'">
+        <set var="PLATFORM_MACOS">0</set>
+    </if>
+
+    <!-- FIXME: PalmOS is another candidate to bakefiles -->
+    <set var="PLATFORM_PALMOS">0</set>
+
     <include file="config.bkl"/>
 
     <include file="plugins_deps.bkl"/>
-    
+
     <!-- ================================================================== -->
-    <!--                     wxWindows version numbers:                     -->
+    <!--                     wxWidgets version numbers:                     -->
     <!-- ================================================================== -->
 
     <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
     <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
     <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
+    <set var="WX_RELEASE" make_var="1">
+        $(WXVER_MAJOR).$(WXVER_MINOR)
+    </set>
+    <set var="WX_RELEASE_NODOT" make_var="1">
+        $(WXVER_MAJOR)$(WXVER_MINOR)
+    </set>
     <set var="WX_VERSION" make_var="1">
-        $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+        $(WX_RELEASE).$(WXVER_RELEASE)
+    </set>
+    <set var="WX_VERSION_NODOT" make_var="1">
+        $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
     </set>
 
     <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
 
+    <!-- this needs to be reset to 0 on beginning of stable series and
+         increment by one 1 every time binary incompatible change is made
+         (i.e. preferably never) -->
+    <set var="WX_BINARY_VERSION">0</set>
+    
     <set var="WXSOVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
+        <if cond="WX_STABLE_BRANCH=='1'">$(WX_BINARY_VERSION).0.0</if>
         <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
     </set>
     <set var="WXMACVERSION">$(WX_VERSION)</set>
     <set var="WXWIN32DLLVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WXVER_MAJOR)$(WXVER_MINOR)</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)</if>
+        <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
+        <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
     </set>
-    
-    
+
+
     <!-- ================================================================== -->
     <!--                     Names of libraries and DLLs:                   -->
     <!-- ================================================================== -->
@@ -45,7 +75,7 @@
         <if cond="USE_GUI=='0'">base</if>
         <if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
     </set>
-    
+
     <set var="WXBASEPORT">
         <if cond="TOOLKIT=='MAC'">_carbon</if>
     </set>
@@ -68,12 +98,13 @@
         <if cond="DEBUG_FLAG=='1'">d</if>
     </set>
     <set var="WXUNICODEFLAG">
-        <if cond="UNICODE=='1'">u</if>
+        <!-- WinCE is Unicode-only platform: -->
+        <if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
     </set>
     <set var="WXNAMESUFFIX">
-        $(WXUNICODEFLAG)$(WXDEBUGFLAG)
+        $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
     </set>
-    
+
     <set var="WXUNIVNAME">
         <if cond="WXUNIV=='1'">univ</if>
     </set>
@@ -84,14 +115,14 @@
     <if cond="FORMAT=='autoconf'">
         <set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
         <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
-        <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
+        <set var="WXVERSIONTAG">-$(WX_RELEASE)</set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="WXNAMEPREFIX">
-            wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+            wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)
         </set>
         <set var="WXNAMEPREFIXGUI">
-            wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+            wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)</set>
         <set var="WXVERSIONTAG"></set>
     </if>
     <set var="WXDLLNAMEPREFIX">
@@ -111,7 +142,7 @@
         <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
     </set>
 
-    
+
     <!-- =============================================================== -->
     <!--                    Names of component libraries:                -->
     <!-- =============================================================== -->
@@ -122,18 +153,27 @@
     <set var="WXLIB_NET">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
     </set>
+    <set var="WXLIB_QA">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('qa')))</if>
+    </set>
     <set var="WXLIB_CORE">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
     </set>
     <set var="WXLIB_ADV">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
     </set>
+    <set var="WXLIB_MEDIA">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
+    </set>
     <set var="WXLIB_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
     </set>
     <set var="WXLIB_XML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
     </set>
+    <set var="WXLIB_XRC">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
+    </set>
     <set var="WXLIB_ODBC">
         <if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
             $(mk.evalExpr(wxwin.mkLibName('odbc')))
@@ -146,12 +186,15 @@
     <set var="WXLIB_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
     </set>
-    
-    
+
+
     <!-- =============================================================== -->
     <!--             Where to store built libraries and objects:         -->
     <!-- =============================================================== -->
-    
+
+    <set var="DIR_SUFFIX_CPU">
+        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+    </set>
 
     <if cond="FORMAT!='autoconf'">
         <set var="WXDLLFLAG">
@@ -161,7 +204,9 @@
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
         <set var="OBJS" make_var="1">
-            <if cond="FORMAT!='cbuilderx'">$(COMPILER)_$(CFG_NAME_PART)</if>
+            <if cond="FORMAT!='cbuilderx'">
+                $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+            </if>
             <!-- FIXME: waiting for removal after CBX has better ../ dirs
                  support -->
             <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
@@ -169,25 +214,27 @@
 
         <set var="BUILDDIR">$(OBJS)</set>
     </if>
-    
+
+    <set var="LIBTYPE_SUFFIX" make_var="1">
+        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
+    </set>
+
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='0'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG)
-        </if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG)
+        <if cond="FORMAT!='autoconf'">
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>
-    
+
     <if cond="FORMAT!='autoconf'">
         <set var="SETUPHDIR" make_var="1">
             $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
         </set>
     </if>
-    
 
-    
+
+
     <!-- =============================================================== -->
     <!--                        Templates for libs:                      -->
     <!-- =============================================================== -->
@@ -199,7 +246,8 @@
         <if cond="DEBUG_INFO=='0'">off</if>
     </set>
     <set var="DEBUGRUNTIME">
-        <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</if>
         <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
         <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
     </set>
@@ -211,6 +259,24 @@
         <if cond="USE_EXCEPTIONS=='1'">on</if>
         <if cond="USE_EXCEPTIONS=='0'">off</if>
     </set>
+    <set var="RTTIFLAG">
+        <if cond="USE_RTTI=='1'">on</if>
+        <if cond="USE_RTTI=='0'">off</if>
+    </set>
+    <set var="THREADSFLAG">
+        <if cond="USE_THREADS=='1'">multi</if>
+        <if cond="USE_THREADS=='0'">single</if>
+    </set>
+
+    <set var="RTTI_DEFINE">
+    	<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
+    </set>
+    <set var="EXCEPTIONS_DEFINE">
+    	<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
+    </set>
+    <set var="THREAD_DEFINE">
+    	<if cond="USE_THREADS=='0'">wxNO_THREADS</if>
+    </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
@@ -224,7 +290,12 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>
-    
+
+    <!-- fill for the specific case of the format/compiler -->
+    <set var="WIN32_WINNT">
+        <if cond="FORMAT=='dmars' or FORMAT=='dmars_smake'">_WIN32_WINNT=0x0400</if>
+    </set>
+
     <set var="UNICOWS_LIB">
         <if cond="MSLU=='1'">unicows</if>
     </set>
@@ -233,50 +304,76 @@
         <debug-info>$(DEBUGINFO)</debug-info>
         <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
         <optimize>$(OPTIMIZEFLAG)</optimize>
-        <threading>multi</threading>
+        <threading>$(THREADSFLAG)</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
-        <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
+        <cxx-rtti>$(RTTIFLAG)</cxx-rtti>
         <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
         <define>$(NO_VC_CRTDBG)</define>
+        <define>$(WIN32_WINNT)</define>
     </template>
-    
+
     <template id="anylib">
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>
     </template>
 
     <template id="3rdparty_lib" template="common_settings,anylib">
-        <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
+        <if cond="FORMAT=='autoconf'">
+            <libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
+        </if>
+        <if cond="FORMAT!='autoconf'">
+            <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
+        </if>
         <!--
         we want to install 3rd party libs system-wide only with static
-        version of wxWindows; otherwise they are embedded in shared libs:
+        version of wxWidgets; otherwise they are embedded in shared libs:
         -->
         <install-if>SHARED=='0'</install-if>
+        <pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
     </template>
-    
-    
+
+
     <!-- deal with the need to copy setup.h here: -->
 
+    <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
+
     <define-tag name="msvc-headers" rules="dll,lib">
-        <if cond="FORMAT=='msvc6prj'">
-            <msvc-project-files>
-                $(addPrefixToList('include\', wxwin.headersOnly(value)))
-            </msvc-project-files>
+        <if cond="IS_MSVC_PRJ">
+            <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
+            <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
+            <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
         </if>
     </define-tag>
 
     <define-tag name="msvc-copy-setup-h" rules="dll,lib">
-        <if cond="FORMAT=='msvc6prj'">
+        <if cond="FORMAT=='msevc4prj'">
+            <msvc-headers>wx/msw/wince/setup.h</msvc-headers>
+            <set var="vc_setup_h">wince\setup.h</set>
+            <set var="vc_setup_h_rule">wince_setup_h</set>
+        </if>
+        <if cond="FORMAT!='msevc4prj'">
             <msvc-headers>wx/msw/setup.h</msvc-headers>
-            <set var="__custom_build_files" append="1">
-                include\wx\msw\setup.h
+            <set var="vc_setup_h">setup.h</set>
+            <set var="vc_setup_h_rule">setup_h</set>
+        </if>
+        <if cond="IS_MSVC_PRJ">
+            <set var="_custom_build_files" append="1">
+                include\wx\msw\$(vc_setup_h)
             </set>
-            <set var="__custom_build_include_wx_msw_setup_h">
+            <set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
 Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\include\wx\msw\$(vc_setup_h)
 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
@@ -291,7 +388,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     <!-- =============================================================== -->
     <!--                         3rd party libs:                         -->
     <!-- =============================================================== -->
-    
+
     <!-- 3rd party libraries: -->
     <include file="regex.bkl"/>
     <include file="zlib.bkl"/>
@@ -301,23 +398,48 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     <include file="odbc.bkl"/>
     <include file="expat.bkl"/>
 
-    
+
     <!-- =============================================================== -->
-    <!--                  Templates for wxWindows libs:                  -->
+    <!--                  Templates for wxWidgets libs:                  -->
     <!-- =============================================================== -->
 
+    <!-- NB: in monolithic build, even wxBase-only must be linked against
+             GUI extralibs, otherwise there would be unresolved references.
+             The variables below are defined so that all libs are used
+             in monolithic build, but not in multilib one. -->
+    <set var="EXTRALIBS_FOR_BASE">
+        <if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
+        <if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
+    </set>
+    <set var="EXTRALIBS_FOR_GUI">
+        <if cond="MONOLITHIC=='1'"></if>
+        <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
+    </set>
+
     <template id="wx" template="common_settings">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
+        <define>$(EXCEPTIONS_DEFINE)</define>
+        <define>$(RTTI_DEFINE)</define>
+        <define>$(THREAD_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
         <!-- this include is added by configure, we need to put other
              includes before it: -->
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
-        <lib-path>$(LIBDIRNAME)</lib-path>        
+        <lib-path>$(LIBDIRNAME)</lib-path>
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <warnings>max</warnings>
+        <cppflags-watcom>
+            -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
+            -wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
+            -wcd=657 <!-- define this function inside its class definition (could have improved code quality) -->
+            -wcd=667 <!-- 'va_start' macro will not work without an argument before '...' -->
+        </cppflags-watcom>
+        <cxxflags-mingw>
+            -Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
+        </cxxflags-mingw>
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
@@ -330,8 +452,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
         <sys-lib>$(LIB_EXPAT)</sys-lib>
-        
-        <ldlibs>$(EXTRALIBS)</ldlibs>
+
+        <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
 
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">
@@ -339,7 +461,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>
-            <if cond="FORMAT!='borland'">
+            <if cond="FORMAT=='msevc4prj'">
+                <sys-lib>ole32</sys-lib>
+                <sys-lib>oleaut32</sys-lib>
+                <sys-lib>uuid</sys-lib>
+                <sys-lib>commctrl</sys-lib>
+                <sys-lib>winsock</sys-lib>
+                <sys-lib>wininet</sys-lib>
+            </if>
+            <if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>
@@ -358,14 +488,16 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
-            <sys-lib>odbc32</sys-lib>
+            <if cond="FORMAT!='msevc4prj'">
+                <sys-lib>odbc32</sys-lib>
+            </if>
         </if>
     </template>
 
 
     <!-- for GUI libs/samples: -->
     <template id="wx_append_nomono" template="wx_append_base_nomono">
-        <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
+        <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
     </template>
 
 
@@ -377,33 +509,31 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <!-- Always link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
     </template>
-    
+
 
     <set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
-    
+
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf'">
+            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
                 <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
                 <precomp-headers-gen>
                     $(WXTOPDIR)src/msw/dummy.cpp
                 </precomp-headers-gen>
             </if>
+            <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
             <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
             <precomp-headers>on</precomp-headers>
             <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
             <precomp-headers-exclude>
-                src/common/unzip.c
                 src/common/extended.c
-                src/msw/gsocket.c
-                src/msw/gsockmsw.c
             </precomp-headers-exclude>
         </if>
-        
-        <if cond="FORMAT=='msvc6prj' and BUILDING_LIB=='1'">
+
+        <if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
             <msvc-file-group>Common Sources:src/common/*</msvc-file-group>
             <msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
             <msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
@@ -424,33 +554,50 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>
         <mac_version>$(WXMACVERSION)</mac_version>
+
+        <!-- version info resources: -->
+        <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
+            <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+            <res-include cond="FORMAT=='autoconf'">
+                $(TOP_SRCDIR)include
+            </res-include>
+        </if>
+        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
     </template>
 
-    <template id="wx_3rdparty_dependencies">
+    <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
+    </template>
+
+    <template id="wx_3rdparty_dependencies"
+              template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
 
-    <template id="wx_3rdparty_includes">
+    <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>
+    </template>
+
+    <template id="wx_3rdparty_includes"
+              template="wx_3rdparty_includes_gui">
         <include>$(INC_ZLIB)</include>
         <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
-    
+
     <template id="wx_lib"
               template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
     <template id="wx_base_lib"
               template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
-        <define>wxUSE_GUI=0</define> 
+        <define>wxUSE_GUI=0</define>
     </template>
 
     <template id="wx_dll"
@@ -459,31 +606,23 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     <template id="wx_base_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
               template_append="msvc_setup_h,wx_append_base_nomono">
-        <define>wxUSE_GUI=0</define> 
+        <define>wxUSE_GUI=0</define>
     </template>
-                           
+
     <!-- =============================================================== -->
-    <!--             Templates for building wxWindows plugins:           -->
+    <!--             Templates for building wxWidgets plugins:           -->
     <!-- =============================================================== -->
 
     <if cond="WX_STABLE_BRANCH=='1'">
         <set var="PLUGIN_VERSION0">
-            <if cond="PLATFORM_UNIX=='1'">
-                $(WXVER_MAJOR).$(WXVER_MINOR)
-            </if>
-            <if cond="PLATFORM_UNIX=='0'">
-                $(WXVER_MAJOR)$(WXVER_MINOR)
-            </if>
+            <if cond="PLATFORM_UNIX=='1'">$(WX_RELEASE)</if>
+            <if cond="PLATFORM_UNIX=='0'">$(WX_RELEASE_NODOT)</if>
         </set>
     </if>
     <if cond="WX_STABLE_BRANCH=='0'">
         <set var="PLUGIN_VERSION0">
-            <if cond="PLATFORM_UNIX=='1'">
-                $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
-            </if>
-            <if cond="PLATFORM_UNIX=='0'">
-                $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
-            </if>
+            <if cond="PLATFORM_UNIX=='1'">$(WX_VERSION)</if>
+            <if cond="PLATFORM_UNIX=='0'">$(WX_VERSION_NODOT)</if>
         </set>
     </if>
     <set var="PLUGVERDELIM">
@@ -491,12 +630,12 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <if cond="PLATFORM_UNIX=='0'"></if>
     </set>
     <set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
-    
+
     <set var="PLUGINSUFFIX">
         <if cond="UNICODE=='0' and BUILD=='release'"></if>
-        <if cond="UNICODE=='0' and BUILD=='debug'">_d</if>
-        <if cond="UNICODE=='1' and BUILD=='release'">_u</if>
-        <if cond="UNICODE=='1' and BUILD=='debug'">_ud</if>
+        <if cond="UNICODE=='0' and BUILD=='debug'">d</if>
+        <if cond="UNICODE=='1' and BUILD=='release'">u</if>
+        <if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
     </set>
 
     <set var="PLUGINS_INST_DIR" make_var="1">
@@ -513,7 +652,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <install-to>$(PLUGINS_INST_DIR)</install-to>
         </template>
     </define-rule>
-    
+
     <define-rule name="wx-gui-plugin" extends="module">
         <template template="wx">
             <dllname>
@@ -523,16 +662,16 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <install-to>$(PLUGINS_INST_DIR)</install-to>
         </template>
     </define-rule>
-    
+
     <!-- =============================================================== -->
-    <!--               Support for wxWindows samples and contrib:        -->
+    <!--               Support for wxWidgets samples and contrib:        -->
     <!-- =============================================================== -->
 
     <!-- Link against one wxWin library. Value must be literal! -->
     <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
         <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
-        <if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
+        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>