Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1) Added INC_FOO variable with include directory for 3rd party libraries

Browse Source 
2) Don't compile ODBC on Windows


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-06-27 13:25:11 +00:00
parent 42d54220ee
commit 332cc656f3
6 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/bakefiles/jpeg.bkl
View File

@@ -10,8 +10,12 @@
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg</if>
</set>
<set var="INC_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
</set>
<lib id="wxjpeg" cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
<lib id="wxjpeg" template="anylib"
cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/jpeg/jcomapi.c

11
build/bakefiles/odbc.bkl
View File

@@ -5,13 +5,20 @@
<option name="wxUSE_ODBC"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_ODBC">builtin</set>
<set var="wxUSE_ODBC">
<if cond="PLATFORM_UNIX=='1'">builtin</if>
<if cond="PLATFORM_UNIX=='0'">0</if>
</set>
</if>
<set var="LIB_ODBC">
<if cond="wxUSE_ODBC=='builtin'">wxodbc</if>
</set>
<set var="INC_ODBC">
<if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
</set>
<lib id="wxodbc" cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
<lib id="wxodbc" template="anylib"
cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/iodbc/catalog.c

7
build/bakefiles/png.bkl
View File

@@ -10,9 +10,14 @@
<set var="LIB_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">wxpng</if>
</set>
<set var="INC_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
</set>
<lib id="wxpng" cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
<lib id="wxpng" template="anylib"
cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include>$(INC_ZLIB)</include>
<sources>
src/png/png.c
src/png/pngerror.c

6
build/bakefiles/regex.bkl
View File

@@ -10,8 +10,12 @@
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">wxregex</if>
</set>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
</set>
<lib id="wxregex" cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<lib id="wxregex" template="anylib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/regex/regcomp.c

13
build/bakefiles/tiff.bkl
View File

@@ -10,10 +10,20 @@
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">wxtiff</if>
</set>
<set var="INC_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
</set>
<lib id="wxtiff" cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
<set var="TIFF_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
</set>
<lib id="wxtiff" template="anylib"
cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<sources>
$(TIFF_PLATFORM_SRC)
src/tiff/tif_aux.c
src/tiff/tif_close.c
src/tiff/tif_codec.c
@@ -42,7 +52,6 @@
src/tiff/tif_strip.c
src/tiff/tif_thunder.c
src/tiff/tif_tile.c
src/tiff/tif_unix.c
src/tiff/tif_version.c
src/tiff/tif_warning.c
src/tiff/tif_write.c

6
build/bakefiles/zlib.bkl
View File

@@ -10,8 +10,12 @@
<set var="LIB_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">wxzlib</if>
</set>
<set var="INC_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
</set>
<lib id="wxzlib" cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
<lib id="wxzlib" teplate="anylib"
cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/zlib/adler32.c