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

usb_webcam: fix build.

Browse Source
This commit is contained in:
Adrien Destugues
2014-10-31 13:46:47 +01:00
parent dff211d8a6
commit a62c3f918c
1 changed files with 77 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/usb_webcam/Jamfile
+15 -4
View File
@@ -14,10 +14,6 @@ if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
} }
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
# source directories # source directories
local sourceDirs = local sourceDirs =
addons/quickcam addons/quickcam
@@ -28,6 +24,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
sensors sensors
; ;
local sourceDir ; local sourceDir ;
for sourceDir in $(sourceDirs) { for sourceDir in $(sourceDirs) {
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons
@@ -59,6 +56,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
tas5130d1b.cpp tas5130d1b.cpp
; ;
## how to build header files from sources to include the list of built-in addons ## how to build header files from sources to include the list of built-in addons
rule USBWebcamHeaderGen header : macro : sources rule USBWebcamHeaderGen header : macro : sources
@@ -75,11 +73,13 @@ for architectureObject in [ MultiArchSubDirSetup ] {
LocalClean clean : $(header) ; LocalClean clean : $(header) ;
} }
actions USBWebcamHeaderGen1 actions USBWebcamHeaderGen1
{ {
grep -h -a $(GREP_DEFINE) $(2) > $(1) ; grep -h -a $(GREP_DEFINE) $(2) > $(1) ;
} }
USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC
: $(addonSources) ; : $(addonSources) ;
USBWebcamHeaderGen CamInternalSensors.h : B_WEBCAM_DECLARE_SENSOR USBWebcamHeaderGen CamInternalSensors.h : B_WEBCAM_DECLARE_SENSOR
@@ -87,6 +87,16 @@ for architectureObject in [ MultiArchSubDirSetup ] {
USBWebcamHeaderGen CamInternalColorSpaceTransforms.h USBWebcamHeaderGen CamInternalColorSpaceTransforms.h
: B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ; : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
for sourceDir in $(sourceDirs) {
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media
media-add-ons usb_webcam $(sourceDir) ] ;
}
Addon [ MultiArchDefaultGristFiles usb_webcam.media_addon ] : Addon [ MultiArchDefaultGristFiles usb_webcam.media_addon ] :
$(addonSources) $(addonSources)
$(csTransformsSources) $(csTransformsSources)
@@ -107,6 +117,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
} }
} }
# force dependancies # force dependancies
Includes [ FGristFiles CamRoster.cpp ] : [ FGristFiles CamInternalAddons.h ] ; Includes [ FGristFiles CamRoster.cpp ] : [ FGristFiles CamInternalAddons.h ] ;
Includes [ FGristFiles CamDevice.cpp ] : [ FGristFiles CamInternalSensors.h ] ; Includes [ FGristFiles CamDevice.cpp ] : [ FGristFiles CamInternalSensors.h ] ;