Skip to content

Commit 43b7f40

Browse files
sadko4usadko4u
committed
Updated build scripts and dependencies
1 parent afddb63 commit 43b7f40

4 files changed

Lines changed: 19 additions & 12 deletions

File tree

‎.cproject‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
6565
</option>
6666
<option id="gnu.cpp.compiler.option.dialect.std.197954724" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
67-
<option id="gnu.cpp.compiler.option.other.other.254051967" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
67+
<option id="gnu.cpp.compiler.option.other.other.254051967" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack libpipewire-0.3 x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
6868
<option id="gnu.cpp.compiler.option.warnings.toerrors.525712114" name="Warnings as errors (-Werror)" superClass="gnu.cpp.compiler.option.warnings.toerrors" useByScannerDiscovery="false" value="true" valueType="boolean"/>
6969
<option id="gnu.cpp.compiler.option.debugging.sanitaddress.1693651654" name="Sanitize address (-fsanitize=address)" superClass="gnu.cpp.compiler.option.debugging.sanitaddress" useByScannerDiscovery="false" value="true" valueType="boolean"/>
7070
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.449118389" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -86,7 +86,7 @@
8686
<listOptionValue builtIn="false" value="USE_LIBX11"/>
8787
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
8888
</option>
89-
<option id="gnu.c.compiler.option.misc.other.1620238063" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
89+
<option id="gnu.c.compiler.option.misc.other.1620238063" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags jack libpipewire-0.3 x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
9090
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.398423821" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
9191
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
9292
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-plugins-shared/include}&quot;"/>
@@ -108,7 +108,7 @@
108108
</tool>
109109
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.2125987081" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
110110
<tool commandLinePattern="${COMMAND} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS} ${FLAGS}" id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1192217523" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
111-
<option id="gnu.cpp.link.option.flags.372033104" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-fsanitize=address $(shell pkg-config --libs jack x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
111+
<option id="gnu.cpp.link.option.flags.372033104" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-fsanitize=address $(shell pkg-config --libs jack libpipewire-0.3 x11 cairo sndfile gl freetype2 fontconfig xrandr gstreamer-audio-1.0)" valueType="string"/>
112112
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.1822061934" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
113113
<listOptionValue builtIn="false" value="pthread"/>
114114
<listOptionValue builtIn="false" value="rt"/>
@@ -167,7 +167,7 @@
167167
</tool>
168168
</fileInfo>
169169
<sourceEntries>
170-
<entry excluding="modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
170+
<entry excluding="modules/lsp-audio-pipewire-lib/src/test/main.cpp|modules/lsp-audio-jack-lib/src/test/main.cpp|modules/lsp-audio-iface/src/test/main.cpp|modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
171171
</sourceEntries>
172172
</configuration>
173173
</storageModule>
@@ -261,7 +261,7 @@
261261
</tool>
262262
</fileInfo>
263263
<sourceEntries>
264-
<entry excluding="modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
264+
<entry excluding="modules/lsp-audio-pipewire-lib/src/test/main.cpp|modules/lsp-audio-jack-lib/src/test/main.cpp|modules/lsp-audio-iface/src/test/main.cpp|modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
265265
</sourceEntries>
266266
</configuration>
267267
</storageModule>
@@ -414,7 +414,7 @@
414414
</tool>
415415
</fileInfo>
416416
<sourceEntries>
417-
<entry excluding="modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
417+
<entry excluding="modules/lsp-audio-pipewire-lib/src/test/main.cpp|modules/lsp-audio-jack-lib/src/test/main.cpp|modules/lsp-audio-iface/src/test/main.cpp|modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
418418
</sourceEntries>
419419
</configuration>
420420
</storageModule>

‎CHANGELOG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*******************************************************************************
44

55
=== 1.0.35 ===
6-
6+
* Updated build scripts and dependencies.
77

88
=== 1.0.34 ===
99
* Added possibility to reveal played sample on 'Listen' button press.

‎dependencies.mk‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,22 @@ LINUX_DEPENDENCIES = \
5050
LIBGL \
5151
LIBGSTREAMER_AUDIO \
5252
LIBJACK \
53+
LIBPIPEWIRE \
5354
LIBPTHREAD \
5455
LIBRT \
5556
LIBSNDFILE \
5657
LIBX11 \
5758
LIBXRANDR \
5859
LSP_AUDIO_JACK_LIB \
60+
LSP_AUDIO_PIPEWIRE_LIB \
5961
LSP_R3D_GLX_LIB
6062

6163
LINUX_TEST_DEPENDENCIES =
6264

6365
ifeq ($(PLATFORM),Linux)
6466
DEPENDENCIES += $(LINUX_DEPENDENCIES)
6567
TEST_DEPENDENCIES += $(LINUX_TEST_DEPENDENCIES)
66-
DEFAULT_FEATURES += standalone gst xdg jack
68+
DEFAULT_FEATURES += standalone gst xdg jack pipewire
6769
endif
6870

6971
#------------------------------------------------------------------------------
@@ -77,20 +79,22 @@ BSD_DEPENDENCIES = \
7779
LIBGSTREAMER_AUDIO \
7880
LIBICONV \
7981
LIBJACK \
82+
LIBPIPEWIRE \
8083
LIBPTHREAD \
8184
LIBRT \
8285
LIBSNDFILE \
8386
LIBX11 \
8487
LIBXRANDR \
8588
LSP_AUDIO_JACK_LIB \
89+
LSP_AUDIO_PIPEWIRE_LIB \
8690
LSP_R3D_GLX_LIB
8791

8892
BSD_TEST_DEPENDENCIES =
8993

9094
ifeq ($(PLATFORM),BSD)
9195
DEPENDENCIES += $(BSD_DEPENDENCIES)
9296
TEST_DEPENDENCIES += $(BSD_TEST_DEPENDENCIES)
93-
DEFAULT_FEATURES += standalone gst xdg jack
97+
DEFAULT_FEATURES += standalone gst xdg jack pipewire
9498
endif
9599

96100
#------------------------------------------------------------------------------
@@ -126,8 +130,7 @@ MACOS_DEPENDENCIES = \
126130
LIBCOREFOUNDATION \
127131
LIBFONTCONFIG \
128132
LIBFREETYPE \
129-
LIBICONV \
130-
LIBJACK
133+
LIBICONV
131134

132135
MACOS_TEST_DEPENDENCIES =
133136

‎modules.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,17 @@ LIBOPENGL32_NAME := libopengl32
219219
LIBOPENGL32_TYPE := opt
220220
LIBOPENGL32_LDFLAGS := -lopengl32
221221

222+
LIBPIPEWIRE_VERSION := system
223+
LIBPIPEWIRE_NAME := libpipewire-0.3
224+
LIBPIPEWIRE_TYPE := pkg
225+
222226
LIBPTHREAD_VERSION := system
223227
LIBPTHREAD_NAME := libpthread
224228
LIBPTHREAD_TYPE := opt
225229
LIBPTHREAD_LDFLAGS := -lpthread
226230

227231
LIBRT_VERSION := system
228-
LIBRT_NAME := librt
232+
LIBRT_NAME := librt
229233
LIBRT_TYPE := opt
230234
LIBRT_LDFLAGS := -lrt
231235

0 commit comments

Comments
 (0)