i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qrencode addon: use KDL-specific qrencode library

Browse Source 
Fixes #11351
This commit is contained in:
Jessica Hamilton
2014-10-19 22:41:31 +00:00
parent 45b7340f16
commit 8e145c66d7
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+5 -8
View File
@@ -473,17 +473,14 @@ if [ IsPackageAvailable libsolv_devel ] {
# qrencode # qrencode
if [ IsPackageAvailable qrencode_devel ] { if [ IsPackageAvailable qrencode_kdl_devel ] {
ExtractBuildFeatureArchives libqrencode : ExtractBuildFeatureArchives libqrencode_kdl :
file: base qrencode file: devel qrencode_kdl_devel
runtime: lib library: $(developLibDir)/libqrencode_kdl.a
file: devel qrencode_devel
depends: base
library: $(developLibDir)/libqrencode.a
headers: $(developHeadersDir) headers: $(developHeadersDir)
; ;
EnableBuildFeatures libqrencode ; EnableBuildFeatures libqrencode_kdl ;
} else { } else {
Echo "qrencode support not available on $(TARGET_PACKAGING_ARCH)" ; Echo "qrencode support not available on $(TARGET_PACKAGING_ARCH)" ;
} }
src/add-ons/kernel/debugger/qrencode/Jamfile
+3 -3
View File
@@ -2,11 +2,11 @@ SubDir HAIKU_TOP src add-ons kernel debugger qrencode ;
UsePrivateHeaders kernel ; UsePrivateHeaders kernel ;
UseBuildFeatureHeaders libqrencode ; UseBuildFeatureHeaders libqrencode_kdl ;
Includes [ FGristFiles module.cpp ] Includes [ FGristFiles module.cpp ]
: [ BuildFeatureAttribute libqrencode : headers ] ; : [ BuildFeatureAttribute libqrencode_kdl : headers ] ;
KernelAddon <kdebug>qrencode : KernelAddon <kdebug>qrencode :
module.cpp module.cpp
: [ BuildFeatureAttribute libqrencode : library ] : [ BuildFeatureAttribute libqrencode_kdl : library ]
; ;