Skip to content

Commit f1cb55f

Browse files
rhornigrhornig
committed
Build file fixes.
1 parent 9295b0d commit f1cb55f

5 files changed

Lines changed: 46 additions & 11 deletions

File tree

‎.cproject‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.omnetpp.cdt.gnu.config.debug.1590007136" moduleId="org.eclipse.cdt.core.settings" name="gcc-debug">
66
<externalSettings/>
77
<extensions>
8-
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
9-
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
10-
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
118
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
129
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
1310
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
1411
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
1512
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
13+
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
14+
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
15+
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
1616
</extensions>
1717
</storageModule>
1818
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
1919
<configuration artifactName="${ProjName}" buildProperties="" description="" id="org.omnetpp.cdt.gnu.config.debug.1590007136" name="gcc-debug" parent="org.omnetpp.cdt.gnu.config.debug">
2020
<folderInfo id="org.omnetpp.cdt.gnu.config.debug.1590007136." name="/" resourcePath="">
2121
<toolChain id="org.omnetpp.cdt.gnu.toolchain.debug.561565264" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.debug">
2222
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform.442367031" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
23-
<builder autoBuildTarget="all" buildPath="${ProjDirPath}" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.omnetpp.cdt.gnu.builder.debug.1373225503" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="OMNEST Make Builder (opp_makemake)" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.omnetpp.cdt.gnu.builder.debug">
23+
<builder autoBuildTarget="all" buildPath="${ProjDirPath}" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.omnetpp.cdt.gnu.builder.debug.1373225503" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="OMNeT++ Make Builder (opp_makemake)" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.omnetpp.cdt.gnu.builder.debug">
2424
<outputEntries>
2525
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
2626
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
@@ -46,6 +46,10 @@
4646
<listOptionValue builtIn="false" value="WITH_TRACI"/>
4747
<listOptionValue builtIn="false" value="WITH_MANET"/>
4848
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
49+
<listOptionValue builtIn="false" value="WITH_AODV"/>
50+
<listOptionValue builtIn="false" value="WITH_RIP"/>
51+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
52+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
4953
</option>
5054
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.529631020" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
5155
</tool>
@@ -68,6 +72,10 @@
6872
<listOptionValue builtIn="false" value="WITH_TRACI"/>
6973
<listOptionValue builtIn="false" value="WITH_MANET"/>
7074
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
75+
<listOptionValue builtIn="false" value="WITH_AODV"/>
76+
<listOptionValue builtIn="false" value="WITH_RIP"/>
77+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
78+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
7179
</option>
7280
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.541669033" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
7381
</tool>
@@ -106,6 +114,10 @@
106114
<listOptionValue builtIn="false" value="WITH_TRACI"/>
107115
<listOptionValue builtIn="false" value="WITH_MANET"/>
108116
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
117+
<listOptionValue builtIn="false" value="WITH_AODV"/>
118+
<listOptionValue builtIn="false" value="WITH_RIP"/>
119+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
120+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
109121
</option>
110122
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.164668854" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
111123
</tool>
@@ -128,6 +140,10 @@
128140
<listOptionValue builtIn="false" value="WITH_TRACI"/>
129141
<listOptionValue builtIn="false" value="WITH_MANET"/>
130142
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
143+
<listOptionValue builtIn="false" value="WITH_AODV"/>
144+
<listOptionValue builtIn="false" value="WITH_RIP"/>
145+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
146+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
131147
</option>
132148
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1205441703" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
133149
</tool>
@@ -149,22 +165,22 @@
149165
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.omnetpp.cdt.gnu.config.release.960890479" moduleId="org.eclipse.cdt.core.settings" name="gcc-release">
150166
<externalSettings/>
151167
<extensions>
152-
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
153-
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
154-
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
155168
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
156169
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
157170
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
158171
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
159172
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
173+
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
174+
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
175+
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
160176
</extensions>
161177
</storageModule>
162178
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
163179
<configuration artifactName="${ProjName}" buildProperties="" description="" id="org.omnetpp.cdt.gnu.config.release.960890479" name="gcc-release" parent="org.omnetpp.cdt.gnu.config.release">
164180
<folderInfo id="org.omnetpp.cdt.gnu.config.release.960890479." name="/" resourcePath="">
165181
<toolChain id="org.omnetpp.cdt.gnu.toolchain.release.1853525977" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.release">
166182
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform.8638873" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
167-
<builder id="org.omnetpp.cdt.gnu.builder.release.2101319956" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNEST Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.release"/>
183+
<builder id="org.omnetpp.cdt.gnu.builder.release.2101319956" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.release"/>
168184
<tool id="cdt.managedbuild.tool.gnu.archiver.base.879724210" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
169185
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.209048065" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
170186
<option id="gnu.cpp.compiler.option.preprocessor.def.261743951" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
@@ -185,6 +201,10 @@
185201
<listOptionValue builtIn="false" value="WITH_TRACI"/>
186202
<listOptionValue builtIn="false" value="WITH_MANET"/>
187203
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
204+
<listOptionValue builtIn="false" value="WITH_AODV"/>
205+
<listOptionValue builtIn="false" value="WITH_RIP"/>
206+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
207+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
188208
</option>
189209
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1288707802" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
190210
</tool>
@@ -207,6 +227,10 @@
207227
<listOptionValue builtIn="false" value="WITH_TRACI"/>
208228
<listOptionValue builtIn="false" value="WITH_MANET"/>
209229
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
230+
<listOptionValue builtIn="false" value="WITH_AODV"/>
231+
<listOptionValue builtIn="false" value="WITH_RIP"/>
232+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
233+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
210234
</option>
211235
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1382867862" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
212236
</tool>
@@ -245,6 +269,10 @@
245269
<listOptionValue builtIn="false" value="WITH_TRACI"/>
246270
<listOptionValue builtIn="false" value="WITH_MANET"/>
247271
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
272+
<listOptionValue builtIn="false" value="WITH_AODV"/>
273+
<listOptionValue builtIn="false" value="WITH_RIP"/>
274+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
275+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
248276
</option>
249277
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.803078146" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
250278
</tool>
@@ -267,6 +295,10 @@
267295
<listOptionValue builtIn="false" value="WITH_TRACI"/>
268296
<listOptionValue builtIn="false" value="WITH_MANET"/>
269297
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
298+
<listOptionValue builtIn="false" value="WITH_AODV"/>
299+
<listOptionValue builtIn="false" value="WITH_RIP"/>
300+
<listOptionValue builtIn="false" value="WITH_RADIO"/>
301+
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
270302
</option>
271303
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1633345790" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
272304
</tool>

‎.nedfolders‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
examples
22
src
33
-inet.applications.voipstream
4+
-inet.examples.voipstream
45
-inet.transport.tcp_lwip
56
-inet.transport.tcp_nsc
6-
-inet.examples.voipstream

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cleanall: checkmakefiles
1010
rm -f src/Makefile
1111

1212
makefiles:
13-
cd src && opp_makemake -f --deep --make-so -o inet -O out -pINET -Xapplications/voipstream -Xtransport/tcp_lwip -Xtransport/tcp_nsc -DWITH_TCP_COMMON -DWITH_TCP_INET -DWITH_IPv4 -DWITH_IPv6 -DWITH_xMIPv6 -DWITH_UDP -DWITH_RTP -DWITH_SCTP -DWITH_DHCP -DWITH_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_TRACI -DWITH_MANET
13+
cd src && opp_makemake -f --deep --make-so -o inet -O out -pINET -Xapplications/voipstream -Xtransport/tcp_lwip -Xtransport/tcp_nsc -DWITH_TCP_COMMON -DWITH_TCP_INET -DWITH_IPv4 -DWITH_IPv6 -DWITH_UDP -DWITH_RTP -DWITH_SCTP -DWITH_DHCP -DWITH_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_TRACI -DWITH_MANET -DWITH_xMIPv6 -DWITH_AODV -DWITH_RIP -DWITH_RADIO -DWITH_IEEE80211
1414

1515
checkmakefiles:
1616
@if [ ! -f src/Makefile ]; then \

‎Makefile.vc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ cleanall: checkmakefiles
99
cd src && $(MAKE) -f Makefile.vc MODE=debug clean
1010

1111
makefiles:
12-
cd src && call opp_nmakemake -f --deep --make-so -o inet -O out -pINET -Xapplications/voipstream -Xtransport/tcp_lwip -Xtransport/tcp_nsc -DWITH_TCP_COMMON -DWITH_TCP_INET -DWITH_IPv4 -DWITH_IPv6 -DWITH_xMIPv6 -DWITH_UDP -DWITH_RTP -DWITH_SCTP -DWITH_DHCP -DWITH_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_TRACI -DWITH_MANET
12+
cd src && call opp_nmakemake -f --deep --make-so -o inet -O out -pINET -Xapplications/voipstream -Xtransport/tcp_lwip -Xtransport/tcp_nsc -DWITH_TCP_COMMON -DWITH_TCP_INET -DWITH_IPv4 -DWITH_IPv6 -DWITH_UDP -DWITH_RTP -DWITH_SCTP -DWITH_DHCP -DWITH_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_TRACI -DWITH_MANET -DWITH_xMIPv6 -DWITH_AODV -DWITH_RIP -DWITH_RADIO -DWITH_IEEE80211
13+
1314

1415
checkmakefiles:
1516
@if not exist src\Makefile.vc ( \

‎examples/manetrouting/gpsr/run‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
../../../src/run_inet $*

0 commit comments

Comments
 (0)