From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 23 Apr 2006 16:38:47 +0000 (+0000)
Subject: don't link against 3rd party image libs when building non-GUI targets
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0019dee69e150bea613a25bf78cd057715efd272?ds=sidebyside

don't link against 3rd party image libs when building non-GUI targets


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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 47e3606816..6efad50fb0 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -493,9 +493,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <!-- for both GUI and wxBase libs/samples: -->
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
-        <sys-lib>$(LIB_TIFF)</sys-lib>
-        <sys-lib>$(LIB_JPEG)</sys-lib>
-        <sys-lib>$(LIB_PNG)</sys-lib>
         <sys-lib>$(LIB_ZLIB)</sys-lib>
         <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
@@ -558,7 +555,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
 
     <!-- for GUI libs/samples: -->
-    <template id="wx_append_nomono" template="wx_append_base_nomono">
+    <template id="wx_append_nomono" template_append="wx_append_base_nomono">
+        <sys-lib>$(LIB_TIFF)</sys-lib>
+        <sys-lib>$(LIB_JPEG)</sys-lib>
+        <sys-lib>$(LIB_PNG)</sys-lib>
         <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
     </template>