fixed include paths to our copies of 3rd party libs

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

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 8f142e1a9a571e173384d9493521b968e35e5f64..d1a8c377f5c37edd5bacfcb9431d23c84801f10b 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -11,7 +11,7 @@
         <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_JPEG">

-        <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
+        <if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)/src/jpeg</if>

     </set>
 
     <lib id="wxjpeg" template="3rdparty_lib"
     </set>
 
     <lib id="wxjpeg" template="3rdparty_lib"

diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index fd325a5fa2bd1ff5ef3085c6607b996652fdd715..e71b062bff3455d4f876cfc3578674b31f03119a 100644 (file)
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_ODBC">
         <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_ODBC">

-        <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
+        <if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)/src/odbc</if>

     </set>
 
     <lib id="wxodbc" template="3rdparty_lib"
     </set>
 
     <lib id="wxodbc" template="3rdparty_lib"

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index f2a88541be693e50b4c5857ba7dc27b4061ef38f..b397f02b2613baa82bcbaea398c7fb17cd9c991b 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -11,7 +11,7 @@
         <if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_PNG">

-        <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
+        <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)/src/png</if>

     </set>
 
     <lib id="wxpng" template="3rdparty_lib"
     </set>
 
     <lib id="wxpng" template="3rdparty_lib"

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index f0fc48c539268c910daf1dab19d5d285d7ccf965..fc36012b694f742161127cffbc3a1edbcafa1492 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -11,7 +11,7 @@
         <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_REGEX">

-        <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
+        <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)/src/regex</if>

     </set>
 
     <lib id="wxregex" template="3rdparty_lib"
     </set>
 
     <lib id="wxregex" template="3rdparty_lib"

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 0ca1fde0ba3d5a81a623e4404d05d1a6d163122f..98bb47e765530ddccacbde3f23298e01ecfb7ba0 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -11,7 +11,7 @@
         <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_TIFF">

-        <if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
+        <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)/src/tiff</if>

     </set>
 
     <set var="TIFF_PLATFORM_SRC">
     </set>
 
     <set var="TIFF_PLATFORM_SRC">

diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index a37a2b0d423fb4981c00c20b8bc573f00aa19a40..10c977605feab6ba9d5feb5f013102c13eaa736b 100644 (file)
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -11,7 +11,7 @@
         <if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_ZLIB">
         <if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_ZLIB">

-        <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
+        <if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)/src/zlib</if>

     </set>
 
     <lib id="wxzlib" template="3rdparty_lib"
     </set>
 
     <lib id="wxzlib" template="3rdparty_lib"