projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for creation of shared libraries under AIX with gcc
[wxWidgets.git]
/
build
/
bakefiles
/
jpeg.bkl
diff --git
a/build/bakefiles/jpeg.bkl
b/build/bakefiles/jpeg.bkl
index 8f7521e0796f0db2931949326e500d05dd1501af..6b4840deee3cb156cdfca7870f2216502e362c9b 100644
(file)
--- a/
build/bakefiles/jpeg.bkl
+++ b/
build/bakefiles/jpeg.bkl
@@
-3,20
+3,29
@@
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBJPEG"/>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBJPEG"/>
+ <set var="LIB_JPEG">
+ <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
+ wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ </if>
+ </set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBJPEG">builtin</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBJPEG">builtin</set>
+ <set var="LIB_JPEG">
+ <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
+ wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+ </if>
+ </set>
</if>
</if>
- <set var="LIB_JPEG">
- <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg</if>
- </set>
<set var="INC_JPEG">
<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"
- cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+ cond="wxUSE_LIBJPEG=='builtin' and
USE_GUI=='1' and
BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<dirname>$(LIBDIRNAME)</dirname>
+ <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
+ <cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
<sources>
src/jpeg/jcomapi.c
src/jpeg/jutils.c
<sources>
src/jpeg/jcomapi.c
src/jpeg/jutils.c