Skip to content

Commit ea2a187

Browse files
sadko4usadko4u
committed
Added support of C++ 11 standard and above.
1 parent bd7beac commit ea2a187

File tree

6 files changed

+87
-9
lines changed

6 files changed

+87
-9
lines changed

‎.cproject

Lines changed: 69 additions & 4 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">
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">
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" 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="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">
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"/>
@@ -29,6 +29,7 @@
2929
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-iface/include}&quot;"/>
3030
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
3131
</option>
32+
<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"/>
3233
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.641013938" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
3334
</tool>
3435
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1381029469" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
@@ -73,7 +74,7 @@
7374
</extensions>
7475
</storageModule>
7576
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
76-
<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.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.522549111" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
77+
<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.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.522549111" name="Release" optionalBuildProperties="" parent="cdt.managedbuild.config.gnu.exe.release">
7778
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.522549111." name="/" resourcePath="">
7879
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.819657818" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
7980
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1015609417" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
@@ -82,6 +83,7 @@
8283
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1791111980" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
8384
<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"/>
8485
<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"/>
86+
<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"/>
8587
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1616599406" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
8688
</tool>
8789
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.676858264" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
@@ -108,6 +110,69 @@
108110
</storageModule>
109111
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
110112
</cconfiguration>
113+
<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">
115+
<externalSettings/>
116+
<extensions>
117+
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
118+
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
119+
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
120+
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
121+
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
122+
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
123+
</extensions>
124+
</storageModule>
125+
<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">
127+
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.705626182.1343390006." name="/" resourcePath="">
128+
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.364246085" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
129+
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1400935511" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
130+
<builder buildPath="${workspace_loc:/lsp-r3d-base-lib}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.2111232022" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
131+
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1756120221" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
132+
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1025722117" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
133+
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.29378162" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
134+
<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.exe.debug.option.debugging.level.1814966226" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
135+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.631390372" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
136+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
137+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
138+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-iface/include}&quot;"/>
139+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
140+
</option>
141+
<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"/>
142+
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.292790526" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
143+
</tool>
144+
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.2075476036" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
145+
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.380584014" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
146+
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.539099166" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
147+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.885270186" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
148+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
149+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
150+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
151+
</option>
152+
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1556748581" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
153+
</tool>
154+
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1121939403" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
155+
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1116055603" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
156+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.1787381066" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
157+
<listOptionValue builtIn="false" value="shlwapi"/>
158+
</option>
159+
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.159250389" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
160+
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
161+
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
162+
</inputType>
163+
</tool>
164+
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1574189953" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
165+
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2112115181" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
166+
</tool>
167+
</toolChain>
168+
</folderInfo>
169+
<sourceEntries>
170+
<entry excluding="modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
171+
</sourceEntries>
172+
</configuration>
173+
</storageModule>
174+
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
175+
</cconfiguration>
111176
</storageModule>
112177
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
113178
<project id="lsp-r3d-base-lib.cdt.managedbuild.target.gnu.exe.109059817" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
@@ -137,4 +202,4 @@
137202
<resource resourceType="PROJECT" workspacePath="/lsp-r3d-base-lib"/>
138203
</configuration>
139204
</storageModule>
140-
</cproject>
205+
</cproject>

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
**/*.gmon
1212
*.core
1313
/.config.mk
14+
/Debug Linux/

‎CHANGELOG

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

55
=== 1.0.3 ===
6+
* Moving towards C++ 11.
67
* Updated build scripts.
78

89
=== 1.0.2 ===

‎dependencies.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ DEPENDENCIES = \
2626

2727
TEST_DEPENDENCIES = \
2828
LSP_TEST_FW
29+
30+
# Platform-dependent
31+
ifeq ($(PLATFORM),Windows)
32+
TEST_DEPENDENCIES += \
33+
LIBSHLWAPI
34+
endif
2935

3036
ALL_DEPENDENCIES = \
3137
$(DEPENDENCIES) \
32-
$(TEST_DEPENDENCIES)
38+
$(TEST_DEPENDENCIES) \
39+
LIBSHLWAPI

‎make/tools.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ CDEFS += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
122122

123123
CXXFLAGS += \
124124
$(CXXFLAGS_EXT) \
125-
-std=c++98 \
126125
-fno-exceptions \
127126
-fno-rtti \
128127
-fdata-sections \

‎modules.mk

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
#
2020

2121
# Variables that describe dependencies
22-
LSP_COMMON_LIB_VERSION := 1.0.17
22+
LSP_COMMON_LIB_VERSION := 1.0.19
2323
LSP_COMMON_LIB_NAME := lsp-common-lib
2424
LSP_COMMON_LIB_TYPE := src
2525
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2626
LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727

28-
LSP_TEST_FW_VERSION := 1.0.11
28+
LSP_TEST_FW_VERSION := 1.0.13
2929
LSP_TEST_FW_NAME := lsp-test-fw
3030
LSP_TEST_FW_TYPE := src
3131
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
3232
LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
3333

34-
LSP_R3D_IFACE_VERSION := 1.0.2
34+
LSP_R3D_IFACE_VERSION := 1.0.3
3535
LSP_R3D_IFACE_NAME := lsp-r3d-iface
3636
LSP_R3D_IFACE_TYPE := src
3737
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
@@ -41,3 +41,8 @@ LIBPTHREAD_VERSION := system
4141
LIBPTHREAD_NAME := libpthread
4242
LIBPTHREAD_TYPE := opt
4343
LIBPTHREAD_LDFLAGS := -lpthread
44+
45+
LIBSHLWAPI_VERSION := system
46+
LIBSHLWAPI_NAME := libshlwapi
47+
LIBSHLWAPI_TYPE := opt
48+
LIBSHLWAPI_LDFLAGS := -lshlwapi

0 commit comments

Comments
 (0)