[haiku-commits] haiku: hrev48183 - src/add-ons/media/media-add-ons/usb_webcam
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 31 Oct 2014 13:47:23 +0100 (CET)
hrev48183 adds 1 changeset to branch 'master'
old head: dff211d8a6c9dfdadab4da366c327afeea03c56e
new head: a62c3f918c2ed7ceff891a3a174c0c7c06da8573
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=a62c3f9+%5Edff211d
----------------------------------------------------------------------------
a62c3f9: usb_webcam: fix build.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48183
Commit: a62c3f918c2ed7ceff891a3a174c0c7c06da8573
URL: http://cgit.haiku-os.org/haiku/commit/?id=a62c3f9
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Fri Oct 31 12:46:47 2014 UTC
----------------------------------------------------------------------------
1 file changed, 73 insertions(+), 62 deletions(-)
.../media/media-add-ons/usb_webcam/Jamfile | 135 ++++++++++---------
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
index 7524c01..5cebfc9 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
+++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
@@ -14,79 +14,89 @@ if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
}
-local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
- on $(architectureObject) {
-
- # source directories
- local sourceDirs =
- addons/quickcam
- addons/sonix
- addons/uvc
- addons
- cstransforms
- sensors
- ;
+# source directories
+local sourceDirs =
+ addons/quickcam
+ addons/sonix
+ addons/uvc
+ addons
+ cstransforms
+ sensors
+;
+
+
+local sourceDir ;
+for sourceDir in $(sourceDirs) {
+ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons
+ usb_webcam $(sourceDir) ] ;
+}
- local sourceDir ;
- for sourceDir in $(sourceDirs) {
- SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons
media media-add-ons
- usb_webcam $(sourceDir) ] ;
- }
+## addon sources
+local addonSources ;
+addonSources =
+ QuickCamDevice.cpp
+ SonixCamDevice.cpp
+ NW80xCamDevice.cpp
+# UVCCamDevice.cpp UVCDeframer.cpp
+;
+
+## colorspace transforms sources
+local csTransformsSources ;
+csTransformsSources = Bayer.cpp ;
+
+## sensors sources
+local sensorsSources ;
+sensorsSources =
+ hdcs1000.cpp
+ hv7131e1.cpp
+ pas106b.cpp
+ pb0100.cpp
+ tas5110c1b.cpp
+ tas5130d1b.cpp
+;
+
+
+## how to build header files from sources to include the list of built-in
addons
+
+rule USBWebcamHeaderGen header : macro : sources
+{
+ header = [ FGristFiles $(header) ] ;
+ sources = [ FGristFiles $(sources) ] ;
+
+ SEARCH on $(sources) = $(SEARCH_SOURCE) ;
+
+ Depends $(header) : $(sources) ;
+ MakeLocateArch $(header) ;
+ GREP_DEFINE on $(header) = $(macro) ;
+ USBWebcamHeaderGen1 $(header) : $(sources) ;
+ LocalClean clean : $(header) ;
+}
- ## addon sources
- local addonSources ;
- addonSources =
- QuickCamDevice.cpp
- SonixCamDevice.cpp
- NW80xCamDevice.cpp
-# UVCCamDevice.cpp UVCDeframer.cpp
- ;
- ## colorspace transforms sources
- local csTransformsSources ;
- csTransformsSources = Bayer.cpp ;
-
- ## sensors sources
- local sensorsSources ;
- sensorsSources =
- hdcs1000.cpp
- hv7131e1.cpp
- pas106b.cpp
- pb0100.cpp
- tas5110c1b.cpp
- tas5130d1b.cpp
- ;
+actions USBWebcamHeaderGen1
+{
+ grep -h -a $(GREP_DEFINE) $(2) > $(1) ;
+}
- ## how to build header files from sources to include the list
of built-in addons
- rule USBWebcamHeaderGen header : macro : sources
- {
- header = [ FGristFiles $(header) ] ;
- sources = [ FGristFiles $(sources) ] ;
+USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC
+ : $(addonSources) ;
+USBWebcamHeaderGen CamInternalSensors.h : B_WEBCAM_DECLARE_SENSOR
+ : $(sensorsSources) ;
+USBWebcamHeaderGen CamInternalColorSpaceTransforms.h
+ : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ;
- SEARCH on $(sources) = $(SEARCH_SOURCE) ;
- Depends $(header) : $(sources) ;
- MakeLocateArch $(header) ;
- GREP_DEFINE on $(header) = $(macro) ;
- USBWebcamHeaderGen1 $(header) : $(sources) ;
- LocalClean clean : $(header) ;
- }
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+ on $(architectureObject) {
- actions USBWebcamHeaderGen1
- {
- grep -h -a $(GREP_DEFINE) $(2) > $(1) ;
+ for sourceDir in $(sourceDirs) {
+ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons
media
+ media-add-ons usb_webcam $(sourceDir) ] ;
}
- USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC
- : $(addonSources) ;
- USBWebcamHeaderGen CamInternalSensors.h :
B_WEBCAM_DECLARE_SENSOR
- : $(sensorsSources) ;
- USBWebcamHeaderGen CamInternalColorSpaceTransforms.h
- : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources)
;
-
Addon [ MultiArchDefaultGristFiles usb_webcam.media_addon ] :
$(addonSources)
$(csTransformsSources)
@@ -107,6 +117,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
}
}
+
# force dependancies
Includes [ FGristFiles CamRoster.cpp ] : [ FGristFiles CamInternalAddons.h ] ;
Includes [ FGristFiles CamDevice.cpp ] : [ FGristFiles CamInternalSensors.h ] ;
Other related posts:
- » [haiku-commits] haiku: hrev48183 - src/add-ons/media/media-add-ons/usb_webcam - pulkomandy
