Skip to content

Commit

Permalink
Updated dependencies and makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@sadko4u
sadko4u committed Jan 31, 2025
1 parent 8d2a851 commit c99b7da
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 45 deletions.
34 changes: 19 additions & 15 deletions .cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,20 @@
</option>
<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">
<listOptionValue builtIn="false" value="LSP_TESTING"/>
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
<listOptionValue builtIn="false" value="USE_LADSPA"/>
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
<listOptionValue builtIn="false" value="USE_LIBX11"/>
<listOptionValue builtIn="false" value="LSP_TRACE"/>
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
<listOptionValue builtIn="false" value="USE_LADSPA"/>
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
<listOptionValue builtIn="false" value="USE_LIBFONTCONFIG"/>
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
<listOptionValue builtIn="false" value="USE_LIBGL"/>
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
<listOptionValue builtIn="false" value="USE_LIBX11"/>
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
</option>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.449118389" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
Expand All @@ -62,18 +64,20 @@
<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"/>
<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"/>
<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">
<listOptionValue builtIn="false" value="LSP_TESTING"/>
<listOptionValue builtIn="false" value="LSP_TRACE"/>
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
<listOptionValue builtIn="false" value="USE_LADSPA"/>
<listOptionValue builtIn="false" value="USE_LIBCAIRO"/>
<listOptionValue builtIn="false" value="USE_LIBFONTCONFIG"/>
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
<listOptionValue builtIn="false" value="USE_LADSPA"/>
<listOptionValue builtIn="false" value="USE_LIBX11"/>
<listOptionValue builtIn="false" value="LSP_TESTING"/>
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
<listOptionValue builtIn="false" value="USE_LIBGL"/>
<listOptionValue builtIn="false" value="USE_LIBJACK"/>
<listOptionValue builtIn="false" value="USE_LIBSNDFILE"/>
<listOptionValue builtIn="false" value="USE_LIBX11"/>
<listOptionValue builtIn="false" value="USE_LIBXRANDR"/>
</option>
<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"/>
<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"/>
<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">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-plugins-shared/include}&quot;"/>
Expand All @@ -95,7 +99,7 @@
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.2125987081" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
<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">
<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"/>
<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"/>
<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">
<listOptionValue builtIn="false" value="pthread"/>
<listOptionValue builtIn="false" value="rt"/>
Expand Down
39 changes: 15 additions & 24 deletions dependencies.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,18 @@ DEFAULT_FEATURES = clap doc ladspa lv2 ui vst2 vst3
#------------------------------------------------------------------------------
# Linux dependencies
LINUX_DEPENDENCIES = \
LIBPTHREAD \
LIBDL \
LIBRT \
LIBSNDFILE \
LIBCAIRO \
LIBDL \
LIBFONTCONFIG \
LIBFREETYPE \
LIBX11 \
LIBXRANDR \
LIBGL \
LIBGSTREAMER_AUDIO \
LIBJACK \
LIBPTHREAD \
LIBRT \
LIBSNDFILE \
LIBX11 \
LIBXRANDR \
LSP_R3D_GLX_LIB

LINUX_TEST_DEPENDENCIES =
Expand All @@ -66,18 +67,19 @@ endif
#------------------------------------------------------------------------------
# BSD dependencies
BSD_DEPENDENCIES = \
LIBPTHREAD \
LIBDL \
LIBRT \
LIBSNDFILE \
LIBICONV \
LIBCAIRO \
LIBDL \
LIBFONTCONFIG \
LIBFREETYPE \
LIBX11 \
LIBXRANDR \
LIBGL \
LIBGSTREAMER_AUDIO \
LIBICONV \
LIBJACK \
LIBPTHREAD \
LIBRT \
LIBSNDFILE \
LIBX11 \
LIBXRANDR \
LSP_R3D_GLX_LIB

BSD_TEST_DEPENDENCIES =
Expand All @@ -88,17 +90,6 @@ ifeq ($(PLATFORM),BSD)
DEFAULT_FEATURES += jack gst xdg
endif


ifeq ($(PLATFORM),Windows)
DEPENDENCIES += \
LIBSHLWAPI \
LIBWINMM \
LIBMSACM \
LIBD2D1 \
LIBOLE \
LIBWINCODEC
endif

#------------------------------------------------------------------------------
# Windows dependencies
WINDOWS_DEPENDENCIES = \
Expand Down
16 changes: 10 additions & 6 deletions modules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,25 @@ LIBCAIRO_VERSION := system
LIBCAIRO_NAME := cairo
LIBCAIRO_TYPE := pkg

LIBDL_VERSION := system
LIBDL_NAME := libdl
LIBDL_TYPE := opt
LIBDL_LDFLAGS := -ldl

LIBD2D1_VERSION := system
LIBD2D1_NAME := libd2d1
LIBD2D1_TYPE := opt
LIBD2D1_LDFLAGS := -ld2d1

LIBDL_VERSION := system
LIBDL_NAME := libdl
LIBDL_TYPE := opt
LIBDL_LDFLAGS := -ldl

LIBDWRITE_VERSION := system
LIBDWRITE_NAME := libdwrite
LIBDWRITE_TYPE := opt
LIBDWRITE_LDFLAGS := -ldwrite

LIBFONTCONFIG_VERSION := system
LIBFONTCONFIG_NAME := fontconfig
LIBFONTCONFIG_TYPE := pkg

LIBFREETYPE_VERSION := system
LIBFREETYPE_NAME := freetype2
LIBFREETYPE_TYPE := pkg
Expand Down Expand Up @@ -178,7 +182,7 @@ LIBOLE_TYPE := opt
LIBOLE_LDFLAGS := -lole32

LIBOPENGL32_VERSION := system
LIBOPENGL32_NAME := libole
LIBOPENGL32_NAME := libopengl32
LIBOPENGL32_TYPE := opt
LIBOPENGL32_LDFLAGS := -lopengl32

Expand Down

0 comments on commit c99b7da

Please sign in to comment.