Skip to content

Commit a1a8bd7

Browse files
sadko4usadko4u
committed
Updated build scripts and dependencies
1 parent f6f67e5 commit a1a8bd7

14 files changed

+69
-70
lines changed

‎.cproject

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,20 @@
4242
</option>
4343
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1754490118" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
4444
<listOptionValue builtIn="false" value="LSP_TESTING"/>
45-
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
46-
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
47-
<listOptionValue builtIn="false" value="USE_LADSPA"/>
48-
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
49-
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
50-
<listOptionValue builtIn="false" value="USE_LIBX11"/>
5145
<listOptionValue builtIn="false" value="LSP_TRACE"/>
5246
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
47+
<listOptionValue builtIn="false" value="USE_LADSPA"/>
48+
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
49+
<listOptionValue builtIn="false" value="USE_LIBFONTCONFIG"/>
50+
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
51+
<listOptionValue builtIn="false" value="USE_LIBGL"/>
52+
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
5353
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
54+
<listOptionValue builtIn="false" value="USE_LIBX11"/>
55+
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
5456
</option>
5557
<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"/>
56-
<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 xrandr gstreamer-audio-1.0)" valueType="string"/>
58+
<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"/>
5759
<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"/>
5860
<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"/>
5961
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.449118389" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -62,18 +64,20 @@
6264
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.834488426" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
6365
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.1949011073" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
6466
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.197520422" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
67+
<listOptionValue builtIn="false" value="LSP_TESTING"/>
6568
<listOptionValue builtIn="false" value="LSP_TRACE"/>
66-
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
67-
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
69+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
70+
<listOptionValue builtIn="false" value="USE_LADSPA"/>
6871
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
72+
<listOptionValue builtIn="false" value="USE_LIBFONTCONFIG"/>
6973
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
70-
<listOptionValue builtIn="false" value="USE_LADSPA"/>
71-
<listOptionValue builtIn="false" value="USE_LIBX11"/>
72-
<listOptionValue builtIn="false" value="LSP_TESTING"/>
73-
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
74+
<listOptionValue builtIn="false" value="USE_LIBGL"/>
75+
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
7476
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
77+
<listOptionValue builtIn="false" value="USE_LIBX11"/>
78+
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
7579
</option>
76-
<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 xrandr gstreamer-audio-1.0)" valueType="string"/>
80+
<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"/>
7781
<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">
7882
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
7983
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-plugins-shared/include}&quot;"/>
@@ -95,7 +99,7 @@
9599
</tool>
96100
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.2125987081" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
97101
<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">
98-
<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 xrandr gstreamer-audio-1.0)" valueType="string"/>
102+
<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"/>
99103
<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">
100104
<listOptionValue builtIn="false" value="pthread"/>
101105
<listOptionValue builtIn="false" value="rt"/>

‎CHANGELOG

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

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

88
=== 1.0.2 ===
99
* Updated build scripts and dependencies.

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/make -f
22
#
3-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
4-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
3+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
4+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
55
#
66
# This file is part of lsp-plugins-return
77
#

‎dependencies.mk

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#
@@ -42,17 +42,18 @@ DEFAULT_FEATURES = clap doc ladspa lv2 ui vst2 vst3
4242
#------------------------------------------------------------------------------
4343
# Linux dependencies
4444
LINUX_DEPENDENCIES = \
45-
LIBPTHREAD \
46-
LIBDL \
47-
LIBRT \
48-
LIBSNDFILE \
4945
LIBCAIRO \
46+
LIBDL \
47+
LIBFONTCONFIG \
5048
LIBFREETYPE \
51-
LIBX11 \
52-
LIBXRANDR \
5349
LIBGL \
5450
LIBGSTREAMER_AUDIO \
5551
LIBJACK \
52+
LIBPTHREAD \
53+
LIBRT \
54+
LIBSNDFILE \
55+
LIBX11 \
56+
LIBXRANDR \
5657
LSP_R3D_GLX_LIB
5758

5859
LINUX_TEST_DEPENDENCIES =
@@ -66,18 +67,19 @@ endif
6667
#------------------------------------------------------------------------------
6768
# BSD dependencies
6869
BSD_DEPENDENCIES = \
69-
LIBPTHREAD \
70-
LIBDL \
71-
LIBRT \
72-
LIBSNDFILE \
73-
LIBICONV \
7470
LIBCAIRO \
71+
LIBDL \
72+
LIBFONTCONFIG \
7573
LIBFREETYPE \
76-
LIBX11 \
77-
LIBXRANDR \
7874
LIBGL \
7975
LIBGSTREAMER_AUDIO \
76+
LIBICONV \
8077
LIBJACK \
78+
LIBPTHREAD \
79+
LIBRT \
80+
LIBSNDFILE \
81+
LIBX11 \
82+
LIBXRANDR \
8183
LSP_R3D_GLX_LIB
8284

8385
BSD_TEST_DEPENDENCIES =
@@ -88,17 +90,6 @@ ifeq ($(PLATFORM),BSD)
8890
DEFAULT_FEATURES += jack gst xdg
8991
endif
9092

91-
92-
ifeq ($(PLATFORM),Windows)
93-
DEPENDENCIES += \
94-
LIBSHLWAPI \
95-
LIBWINMM \
96-
LIBMSACM \
97-
LIBD2D1 \
98-
LIBOLE \
99-
LIBWINCODEC
100-
endif
101-
10293
#------------------------------------------------------------------------------
10394
# Windows dependencies
10495
WINDOWS_DEPENDENCIES = \

‎make/configure.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎make/functions.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎make/modules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎make/paths.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎make/system.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎make/tools.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎modules.mk

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#
@@ -121,21 +121,25 @@ LIBCAIRO_VERSION := system
121121
LIBCAIRO_NAME := cairo
122122
LIBCAIRO_TYPE := pkg
123123

124-
LIBDL_VERSION := system
125-
LIBDL_NAME := libdl
126-
LIBDL_TYPE := opt
127-
LIBDL_LDFLAGS := -ldl
128-
129124
LIBD2D1_VERSION := system
130125
LIBD2D1_NAME := libd2d1
131126
LIBD2D1_TYPE := opt
132127
LIBD2D1_LDFLAGS := -ld2d1
133128

129+
LIBDL_VERSION := system
130+
LIBDL_NAME := libdl
131+
LIBDL_TYPE := opt
132+
LIBDL_LDFLAGS := -ldl
133+
134134
LIBDWRITE_VERSION := system
135135
LIBDWRITE_NAME := libdwrite
136136
LIBDWRITE_TYPE := opt
137137
LIBDWRITE_LDFLAGS := -ldwrite
138138

139+
LIBFONTCONFIG_VERSION := system
140+
LIBFONTCONFIG_NAME := fontconfig
141+
LIBFONTCONFIG_TYPE := pkg
142+
139143
LIBFREETYPE_VERSION := system
140144
LIBFREETYPE_NAME := freetype2
141145
LIBFREETYPE_TYPE := pkg
@@ -178,7 +182,7 @@ LIBOLE_TYPE := opt
178182
LIBOLE_LDFLAGS := -lole32
179183

180184
LIBOPENGL32_VERSION := system
181-
LIBOPENGL32_NAME := libole
185+
LIBOPENGL32_NAME := libopengl32
182186
LIBOPENGL32_TYPE := opt
183187
LIBOPENGL32_LDFLAGS := -lopengl32
184188

‎plugins.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎project.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

‎src/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2024 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2025 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-plugins-return
66
#

0 commit comments

Comments
 (0)