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
This commit is contained in:
parent
ea28b8853b
commit
7b11429dc3
@ -11,7 +11,7 @@
|
||||
<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"
|
||||
|
@ -14,7 +14,7 @@
|
||||
<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"
|
||||
|
@ -11,7 +11,7 @@
|
||||
<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"
|
||||
|
@ -11,7 +11,7 @@
|
||||
<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"
|
||||
|
@ -11,7 +11,7 @@
|
||||
<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">
|
||||
|
@ -11,7 +11,7 @@
|
||||
<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"
|
||||
|
Loading…
Reference in New Issue
Block a user