Skip to content

Commit

Permalink
Conformance with OMNeT++ 5.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp authored and Philipp committed May 24, 2017
1 parent 875b1af commit f6c92e4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .cproject
View file
Expand Up @@ -31,8 +31,8 @@
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1592839142" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<option id="gnu.cpp.compiler.option.preprocessor.def.1246268161" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false"/>
<option id="gnu.cpp.compiler.option.include.paths.1119209497" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value=".././core4inet/api/AS6802/tte_api"/>
<listOptionValue builtIn="false" value="../../src"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/CoRE4INET/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/CoRE4INET/src/core4inet/api/AS6802/tte_api}&quot;"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.undef.1177217810" name="Undefined symbols (-U)" superClass="gnu.cpp.compiler.option.preprocessor.undef" useByScannerDiscovery="false" valueType="undefDefinedSymbols">
<listOptionValue builtIn="false" value="__CHAR16_TYPE__"/>
Expand Down Expand Up @@ -286,7 +286,7 @@
<builder id="org.omnetpp.cdt.gnu.builder.release.1149544439" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.release"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1552812456" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1001670330" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<option id="gnu.cpp.compiler.option.preprocessor.def.276427390" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"/>
<option id="gnu.cpp.compiler.option.preprocessor.def.276427390" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false"/>
<option id="gnu.cpp.compiler.option.include.paths.1226114237" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="../core4inet/api/AS6802/tte_api"/>
<listOptionValue builtIn="false" value=".././"/>
Expand Down Expand Up @@ -414,7 +414,7 @@
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1295153564" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base.1552812456"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.731673426" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base.1001670330">
<option id="gnu.cpp.compiler.option.preprocessor.def.1649563841" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols"/>
<option id="gnu.cpp.compiler.option.preprocessor.def.1649563841" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def"/>
<option id="gnu.cpp.compiler.option.preprocessor.undef.1534915787" name="Undefined symbols (-U)" superClass="gnu.cpp.compiler.option.preprocessor.undef" valueType="undefDefinedSymbols">
<listOptionValue builtIn="false" value="__CHAR16_TYPE__"/>
<listOptionValue builtIn="false" value="__STDC__"/>
Expand Down
2 changes: 1 addition & 1 deletion .oppbuildspec
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<buildspec version="4.0">
<dir path="." type="custom"/>
<dir makemake-options="--make-so --deep -O out --meta:use-exported-include-paths --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
<dir makemake-options="--make-so --deep -O out --meta:export-include-path --meta:use-exported-include-paths --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
</buildspec>
3 changes: 2 additions & 1 deletion Makefile
View file
Expand Up @@ -11,7 +11,8 @@ cleanall: checkmakefiles

INET_PROJ=../../inet
EXTRA_INCLUDES= -Icore4inet/api/AS6802/tte_api
MAKEMAKE_OPTIONS := -f --deep --no-deep-includes -I. $(EXTRA_INCLUDES) -I$(INET_PROJ)/src/ -L$(INET_PROJ)/src -lINET -KINET_PROJ=$(INET_PROJ)
MAKEMAKE_OPTIONS := -f --deep -O out -KINET_PROJ=../../inet -I. $(EXTRA_INCLUDES) -I$(INET_PROJ)/src/ -L$$\(INET_PROJ\)/out/$$\(CONFIGNAME\)/src -lINET


makefiles: src/core4inet/features.h makefiles-so

Expand Down

0 comments on commit f6c92e4

Please sign in to comment.