forgot to reset m_iconAdded

[wxWidgets.git] / build / bakefiles / jpeg.bkl

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 66b17c91f68e0702f506c954c46f79ebbe09263d..a876bbd826d62c54bdf273b515a90c94cd287d09 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -9,7 +9,7 @@
     </if>
     <set var="LIB_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
-            wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+            wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         </if>
     </set>
     <set var="INC_JPEG">
@@ -19,7 +19,7 @@
     <lib id="wxjpeg" template="3rdparty_lib"
          cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
-        <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
+        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
         <sources>
             src/jpeg/jcomapi.c