@@ -235,13 +235,13 @@ CXX_SRC = \
235
235
$(CXX_SRC_DSP ) \
236
236
$(CXX_SRC_UI ) \
237
237
$(CXX_SRC_CTL ) \
238
- $(if $( findstring jack,$(ENABLED_FEATURES ) ) ,$(CXX_SRC_WRAP_JACK ) ) \
238
+ $(call fcheck, jack,$(ENABLED_FEATURES ) ,$(CXX_SRC_WRAP_JACK ) ) \
239
239
$(CXX_SRC_WRAP_LADSPA ) \
240
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(CXX_SRC_WRAP_LV2 ) ) \
241
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(CXX_SRC_WRAP_LV2_UI ) ) \
242
- $(if $( findstring vst2,$(ENABLED_FEATURES ) ) ,$(CXX_SRC_WRAP_VST2 ) ) \
243
- $(if $( findstring clap,$(ENABLED_FEATURES ) ) ,$(CXX_SRC_WRAP_CLAP ) ) \
244
- $(if $(CAIRO_VERSION ) ,$(CXX_SRC_WRAP_CAIRO ) ) \
240
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(CXX_SRC_WRAP_LV2 ) ) \
241
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(CXX_SRC_WRAP_LV2_UI ) ) \
242
+ $(call fcheck, vst2,$(ENABLED_FEATURES ) ,$(CXX_SRC_WRAP_VST2 ) ) \
243
+ $(call fcheck, clap,$(ENABLED_FEATURES ) ,$(CXX_SRC_WRAP_CLAP ) ) \
244
+ $(if $(LIBCAIRO_VERSION ) ,$(CXX_SRC_WRAP_CAIRO ) ) \
245
245
$(CXX_SRC_UTIL )
246
246
247
247
# Source code location for host
@@ -267,13 +267,13 @@ HOST_CXX_SRC = \
267
267
$(HOST_CXX_SRC_DSP ) \
268
268
$(HOST_CXX_SRC_UI ) \
269
269
$(HOST_CXX_SRC_CTL ) \
270
- $(if $( findstring jack,$(ENABLED_FEATURES ) ) ,$(HOST_CXX_SRC_WRAP_JACK ) ) \
270
+ $(call fcheck, jack,$(ENABLED_FEATURES ) ,$(HOST_CXX_SRC_WRAP_JACK ) ) \
271
271
$(HOST_CXX_SRC_WRAP_LADSPA ) \
272
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(HOST_CXX_SRC_WRAP_LV2 ) ) \
273
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(HOST_CXX_SRC_WRAP_LV2_UI ) ) \
274
- $(if $( findstring vst2,$(ENABLED_FEATURES ) ) ,$(HOST_CXX_SRC_WRAP_VST2 ) ) \
275
- $(if $( findstring clap,$(ENABLED_FEATURES ) ) ,$(HOST_CXX_SRC_WRAP_CLAP ) ) \
276
- $(if $(CAIRO_VERSION ) ,$(HOST_CXX_SRC_WRAP_CAIRO ) ) \
272
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(HOST_CXX_SRC_WRAP_LV2 ) ) \
273
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(HOST_CXX_SRC_WRAP_LV2_UI ) ) \
274
+ $(call fcheck, vst2,$(ENABLED_FEATURES ) ,$(HOST_CXX_SRC_WRAP_VST2 ) ) \
275
+ $(call fcheck, clap,$(ENABLED_FEATURES ) ,$(HOST_CXX_SRC_WRAP_CLAP ) ) \
276
+ $(if $(LIBCAIRO_VERSION ) ,$(HOST_CXX_SRC_WRAP_CAIRO ) ) \
277
277
$(HOST_CXX_SRC_UTIL )
278
278
279
279
# Object files for (cross) build
@@ -301,13 +301,13 @@ OBJ = \
301
301
$(OBJ_UI ) \
302
302
$(OBJ_CTL ) \
303
303
$(OBJ_UTIL ) \
304
- $(if $( findstring jack,$(ENABLED_FEATURES ) ) ,$(OBJ_WRAP_JACK ) ) \
304
+ $(call fcheck, jack,$(ENABLED_FEATURES ) ,$(OBJ_WRAP_JACK ) ) \
305
305
$(OBJ_WRAP_LADSPA ) \
306
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(OBJ_WRAP_LV2 ) ) \
307
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(OBJ_WRAP_LV2_UI ) ) \
308
- $(if $( findstring vst2,$(ENABLED_FEATURES ) ) ,$(OBJ_WRAP_VST2 ) ) \
309
- $(if $( findstring clap,$(ENABLED_FEATURES ) ) ,$(OBJ_WRAP_CLAP ) ) \
310
- $(if $(CAIRO_VERSION ) ,$(OBJ_WRAP_CAIRO ) )
306
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(OBJ_WRAP_LV2 ) ) \
307
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(OBJ_WRAP_LV2_UI ) ) \
308
+ $(call fcheck, vst2,$(ENABLED_FEATURES ) ,$(OBJ_WRAP_VST2 ) ) \
309
+ $(call fcheck, clap,$(ENABLED_FEATURES ) ,$(OBJ_WRAP_CLAP ) ) \
310
+ $(if $(LIBCAIRO_VERSION ) ,$(OBJ_WRAP_CAIRO ) )
311
311
312
312
# Object files for host build
313
313
HOST_OBJ_STUB = $(patsubst % .cpp, % .o, $(HOST_CXX_SRC_STUB ) )
@@ -334,13 +334,13 @@ HOST_OBJ = \
334
334
$(HOST_OBJ_UI ) \
335
335
$(HOST_OBJ_CTL ) \
336
336
$(HOST_OBJ_UTIL ) \
337
- $(if $( findstring jack,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_JACK ) ) \
337
+ $(call fcheck, jack,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_JACK ) ) \
338
338
$(HOST_OBJ_WRAP_LADSPA ) \
339
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_LV2 ) ) \
340
- $(if $( findstring lv2,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_LV2_UI ) ) \
341
- $(if $( findstring vst2,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_VST2 ) ) \
342
- $(if $( findstring clap,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_CLAP ) ) \
343
- $(if $(CAIRO_VERSION ) ,$(HOST_OBJ_WRAP_CAIRO ) )
339
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_LV2 ) ) \
340
+ $(call fcheck, lv2,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_LV2_UI ) ) \
341
+ $(call fcheck, vst2,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_VST2 ) ) \
342
+ $(call fcheck, clap,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_CLAP ) ) \
343
+ $(if $(LIBCAIRO_VERSION ) ,$(HOST_OBJ_WRAP_CAIRO ) )
344
344
345
345
ifeq ($(TEST ) ,1)
346
346
CXX_SRC += $(CXX_SRC_TEST )
@@ -521,7 +521,7 @@ ARTIFACT_LIB_JACK_OBJS = \
521
521
$(LSP_PLUGIN_FW_OBJ_UI ) \
522
522
$(LSP_PLUGIN_FW_OBJ_CTL ) \
523
523
$(LSP_PLUGIN_FW_OBJ_RES ) \
524
- $(if $(CAIRO_VERSION ) ,$(LSP_PLUGIN_FW_OBJ_WRAP_CAIRO ) ) \
524
+ $(if $(LIBCAIRO_VERSION ) ,$(LSP_PLUGIN_FW_OBJ_WRAP_CAIRO ) ) \
525
525
$(OBJ_EXPORT ) \
526
526
$(OBJ_PLUG_META ) \
527
527
$(OBJ_PLUG_DSP ) \
@@ -554,7 +554,7 @@ ARTIFACT_LIB_LV2_OBJS = \
554
554
$(LSP_PLUGIN_FW_OBJ_META ) \
555
555
$(LSP_PLUGIN_FW_OBJ_DSP ) \
556
556
$(LSP_PLUGIN_FW_OBJ_RES ) \
557
- $(if $(CAIRO_VERSION ) ,$(LSP_PLUGIN_FW_OBJ_WRAP_CAIRO ) ) \
557
+ $(if $(LIBCAIRO_VERSION ) ,$(LSP_PLUGIN_FW_OBJ_WRAP_CAIRO ) ) \
558
558
$(OBJ_PLUG_META ) \
559
559
$(OBJ_PLUG_DSP ) \
560
560
$(OBJ_PLUG_SHARED ) \
@@ -632,16 +632,17 @@ ifeq ($(TEST),1)
632
632
$(HOST_LSP_PLUGIN_FW_OBJ_CTL ) \
633
633
$(HOST_LSP_PLUGIN_FW_OBJ_RES ) \
634
634
$(HOST_LSP_PLUGIN_FW_OBJ_TEST ) \
635
- $(if $(CAIRO_VERSION ) ,$(HOST_LSP_PLUGIN_FW_OBJ_WRAP_CAIRO ) ) \
635
+ $(if $(LIBCAIRO_VERSION ) ,$(HOST_LSP_PLUGIN_FW_OBJ_WRAP_CAIRO ) ) \
636
636
$(HOST_OBJ_PLUG_META ) \
637
637
$(HOST_OBJ_PLUG_DSP ) \
638
638
$(HOST_OBJ_PLUG_SHARED ) \
639
639
$(HOST_OBJ_PLUG_UI ) \
640
- $(if $( findstring jack,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_JACK ) ) \
640
+ $(call fcheck, jack,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_JACK ) ) \
641
641
$(HOST_OBJ_WRAP_LADSPA ) \
642
- $(if $(findstring lv2,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_LV2 ) ) \
643
- $(if $(findstring lv2,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_LV2UI ) ) \
644
- $(if $(findstring vst2,$(ENABLED_FEATURES ) ) ,$(HOST_OBJ_WRAP_VST2 ) ) \
642
+ $(call fcheck,lv2,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_LV2 ) ) \
643
+ $(call fcheck,lv2,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_LV2UI ) ) \
644
+ $(call fcheck,vst2,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_VST2 ) ) \
645
+ $(call fcheck,clap,$(ENABLED_FEATURES ) ,$(HOST_OBJ_WRAP_CLAP ) ) \
645
646
$(HOST_UTL_COMMON_OBJ ) \
646
647
$(HOST_UTL_VALIDATOR_OBJ ) \
647
648
$(HOST_UTL_JACK_MAKE_OBJ ) \
0 commit comments