Skip to content

Commit 8597f67

Browse files
sadko4usadko4u
committed
Updated build
1 parent 9c449ed commit 8597f67

File tree

7 files changed

+83
-36
lines changed

7 files changed

+83
-36
lines changed

‎.cproject

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
33
<storageModule moduleId="org.eclipse.cdt.core.settings">
44
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.705626182">
5-
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.705626182" moduleId="org.eclipse.cdt.core.settings" name="Debug Linux">
5+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.705626182" moduleId="org.eclipse.cdt.core.settings" name="DebugLinux">
66
<externalSettings/>
77
<extensions>
88
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -14,7 +14,7 @@
1414
</extensions>
1515
</storageModule>
1616
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
17-
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.705626182" name="Debug Linux" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.exe.debug">
17+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.705626182" name="DebugLinux" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.exe.debug">
1818
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.705626182." name="/" resourcePath="">
1919
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.2068026832" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
2020
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.171051444" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
@@ -30,6 +30,9 @@
3030
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
3131
</option>
3232
<option id="gnu.cpp.compiler.option.dialect.std.1954407220" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
33+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1394487476" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
34+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
35+
</option>
3336
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.641013938" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
3437
</tool>
3538
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1381029469" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
@@ -40,6 +43,9 @@
4043
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
4144
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
4245
</option>
46+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.1241691936" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
47+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
48+
</option>
4349
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.736688226" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
4450
</tool>
4551
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1514007439" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
@@ -84,11 +90,17 @@
8490
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.984701037" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
8591
<option defaultValue="gnu.cpp.compiler.debugging.level.none" id="gnu.cpp.compiler.exe.release.option.debugging.level.1265681203" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
8692
<option id="gnu.cpp.compiler.option.dialect.std.1749799414" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
93+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.790840761" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
94+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
95+
</option>
8796
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1616599406" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
8897
</tool>
8998
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.676858264" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
9099
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.585862832" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
91100
<option defaultValue="gnu.c.debugging.level.none" id="gnu.c.compiler.exe.release.option.debugging.level.2085962841" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
101+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.473707831" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
102+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
103+
</option>
92104
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1200202128" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
93105
</tool>
94106
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.804882748" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
@@ -111,7 +123,7 @@
111123
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
112124
</cconfiguration>
113125
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.705626182.1343390006">
114-
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.705626182.1343390006" moduleId="org.eclipse.cdt.core.settings" name="Debug Win">
126+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.705626182.1343390006" moduleId="org.eclipse.cdt.core.settings" name="DebugWin">
115127
<externalSettings/>
116128
<extensions>
117129
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -123,7 +135,7 @@
123135
</extensions>
124136
</storageModule>
125137
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
126-
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.705626182.1343390006" name="Debug Win" optionalBuildProperties="" parent="cdt.managedbuild.config.gnu.exe.debug">
138+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.705626182.1343390006" name="DebugWin" optionalBuildProperties="" parent="cdt.managedbuild.config.gnu.exe.debug">
127139
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.705626182.1343390006." name="/" resourcePath="">
128140
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.364246085" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
129141
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1400935511" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
@@ -139,6 +151,9 @@
139151
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
140152
</option>
141153
<option id="gnu.cpp.compiler.option.dialect.std.2057861912" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
154+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.146669855" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
155+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
156+
</option>
142157
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.292790526" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
143158
</tool>
144159
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.2075476036" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
@@ -149,6 +164,9 @@
149164
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
150165
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
151166
</option>
167+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.990169030" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
168+
<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
169+
</option>
152170
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1556748581" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
153171
</tool>
154172
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1121939403" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
@@ -195,10 +213,12 @@
195213
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
196214
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
197215
<storageModule moduleId="refreshScope" versionNumber="2">
198-
<configuration configurationName="Debug">
216+
<configuration configurationName="Debug Linux"/>
217+
<configuration configurationName="Debug Win"/>
218+
<configuration configurationName="Release">
199219
<resource resourceType="PROJECT" workspacePath="/lsp-r3d-base-lib"/>
200220
</configuration>
201-
<configuration configurationName="Release">
221+
<configuration configurationName="Debug">
202222
<resource resourceType="PROJECT" workspacePath="/lsp-r3d-base-lib"/>
203223
</configuration>
204224
</storageModule>

‎.gitignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
/.settings/*
33
/.build/*
44
/.test/*
5-
/Debug/*
6-
/Release/*
7-
/Debug/
8-
/Release
95
*.log
106
/gmon.out
117
**/*.gmon
128
*.core
139
/.config.mk
14-
/Debug Linux/
10+
/modules/
11+
/Release/
12+
/DebugLinux/
13+
/DebugWin/

‎dependencies.mk

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,57 @@
1818
# along with lsp-r3d-base-lib. If not, see <https://www.gnu.org/licenses/>.
1919
#
2020

21-
# List of dependencies
21+
#------------------------------------------------------------------------------
22+
# List of common dependencies
2223
DEPENDENCIES = \
23-
LIBPTHREAD \
2424
LSP_COMMON_LIB \
2525
LSP_R3D_IFACE
2626

2727
TEST_DEPENDENCIES = \
2828
LSP_TEST_FW
29-
30-
# Platform-dependent
29+
30+
#------------------------------------------------------------------------------
31+
# Linux dependencies
32+
LINUX_DEPENDENCIES =
33+
34+
LINUX_TEST_DEPENDENCIES =
35+
36+
ifeq ($(PLATFORM),Linux)
37+
DEPENDENCIES += $(LINUX_DEPENDENCIES)
38+
TEST_DEPENDENCIES += $(LINUX_TEST_DEPENDENCIES)
39+
endif
40+
41+
#------------------------------------------------------------------------------
42+
# BSD dependencies
43+
BSD_DEPENDENCIES =
44+
45+
BSD_TEST_DEPENDENCIES =
46+
47+
ifeq ($(PLATFORM),BSD)
48+
DEPENDENCIES += $(BSD_DEPENDENCIES)
49+
TEST_DEPENDENCIES += $(BSD_TEST_DEPENDENCIES)
50+
endif
51+
52+
#------------------------------------------------------------------------------
53+
# Windows dependencies
54+
WINDOWS_DEPENDENCIES =
55+
56+
WINDOWS_TEST_DEPENDENCIES = \
57+
LIBSHLWAPI
58+
3159
ifeq ($(PLATFORM),Windows)
32-
TEST_DEPENDENCIES += \
33-
LIBSHLWAPI
60+
DEPENDENCIES += $(WINDOWS_DEPENDENCIES)
61+
TEST_DEPENDENCIES += $(WINDOWS_TEST_DEPENDENCIES)
3462
endif
3563

64+
#------------------------------------------------------------------------------
65+
# Overall system dependencies
3666
ALL_DEPENDENCIES = \
3767
$(DEPENDENCIES) \
68+
$(LINUX_DEPENDENCIES) \
69+
$(BSD_DEPENDENCIES) \
70+
$(WINDOWS_DEPENDENCIES) \
3871
$(TEST_DEPENDENCIES) \
39-
LIBSHLWAPI
72+
$(LINUX_TEST_DEPENDENCIES) \
73+
$(BSD_TEST_DEPENDENCIES) \
74+
$(WINDOWS_TEST_DEPENDENCIES)

‎include/lsp-plug.in/r3d/base/backend.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace lsp
6363
static status_t get_location(backend_t *handle, ssize_t *left, ssize_t *top, ssize_t *width, ssize_t *height);
6464

6565
} base_backend_t;
66-
}
67-
}
66+
} /* namespace r3d */
67+
} /* namespace lsp */
6868

6969
#endif /* LSP_PLUG_IN_R3D_BASE_BACKEND_H_ */

‎include/lsp-plug.in/r3d/base/version.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,12 @@
2626
#define LSP_R3D_BASE_LIB_MINOR 0
2727
#define LSP_R3D_BASE_LIB_MICRO 5
2828

29-
#ifdef LSP_R3D_BASE_LIB_BUILTIN
30-
#define LSP_R3D_BASE_LIB_EXPORT
31-
#define LSP_R3D_BASE_LIB_CEXPORT
32-
#define LSP_R3D_BASE_LIB_IMPORT LSP_SYMBOL_IMPORT
33-
#define LSP_R3D_BASE_LIB_CIMPORT LSP_CSYMBOL_IMPORT
29+
#if defined(LSP_R3D_BASE_LIB_PUBLISHER)
30+
#define LSP_R3D_BASE_LIB_PUBLIC LSP_EXPORT_MODIFIER
31+
#elif defined(LSP_R3D_BASE_LIB_BUILTIN) || defined(LSP_IDE_DEBUG)
32+
#define LSP_R3D_BASE_LIB_PUBLIC
3433
#else
35-
#define LSP_R3D_BASE_LIB_EXPORT LSP_SYMBOL_EXPORT
36-
#define LSP_R3D_BASE_LIB_CEXPORT LSP_CSYMBOL_EXPORT
37-
#define LSP_R3D_BASE_LIB_IMPORT LSP_SYMBOL_IMPORT
38-
#define LSP_R3D_BASE_LIB_CIMPORT LSP_CSYMBOL_IMPORT
34+
#define LSP_R3D_BASE_LIB_PUBLIC LSP_IMPORT_MODIFIER
3935
#endif
4036

4137
#endif /* LSP_PLUG_IN_R3D_VERSION_H_ */

‎modules.mk

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
# along with lsp-r3d-base-lib. If not, see <https://www.gnu.org/licenses/>.
1919
#
2020

21-
# Variables that describe dependencies
21+
#------------------------------------------------------------------------------
22+
# Variables that describe source code dependencies
2223
LSP_COMMON_LIB_VERSION := 1.0.20
2324
LSP_COMMON_LIB_NAME := lsp-common-lib
2425
LSP_COMMON_LIB_TYPE := src
@@ -37,11 +38,8 @@ LSP_R3D_IFACE_TYPE := src
3738
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
3839
LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
3940

40-
LIBPTHREAD_VERSION := system
41-
LIBPTHREAD_NAME := libpthread
42-
LIBPTHREAD_TYPE := opt
43-
LIBPTHREAD_LDFLAGS := -lpthread
44-
41+
#------------------------------------------------------------------------------
42+
# Variables that describe system dependencies
4543
LIBSHLWAPI_VERSION := system
4644
LIBSHLWAPI_NAME := libshlwapi
4745
LIBSHLWAPI_TYPE := opt

‎modules/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)