Skip to content

Commit

Permalink
Build file fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
rhornig committed Jun 12, 2014
1 parent 9295b0d commit f1cb55f
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 11 deletions.
48 changes: 40 additions & 8 deletions .cproject
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
<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">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="org.omnetpp.cdt.gnu.config.debug.1590007136" name="gcc-debug" parent="org.omnetpp.cdt.gnu.config.debug">
<folderInfo id="org.omnetpp.cdt.gnu.config.debug.1590007136." name="/" resourcePath="">
<toolChain id="org.omnetpp.cdt.gnu.toolchain.debug.561565264" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.debug">
<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"/>
<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">
<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">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
Expand All @@ -46,6 +46,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.529631020" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -68,6 +72,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.541669033" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand Down Expand Up @@ -106,6 +114,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.164668854" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -128,6 +140,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1205441703" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand All @@ -149,22 +165,22 @@
<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">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="org.omnetpp.cdt.gnu.config.release.960890479" name="gcc-release" parent="org.omnetpp.cdt.gnu.config.release">
<folderInfo id="org.omnetpp.cdt.gnu.config.release.960890479." name="/" resourcePath="">
<toolChain id="org.omnetpp.cdt.gnu.toolchain.release.1853525977" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.release">
<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"/>
<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"/>
<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"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.879724210" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.209048065" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<option id="gnu.cpp.compiler.option.preprocessor.def.261743951" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
Expand All @@ -185,6 +201,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1288707802" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -207,6 +227,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1382867862" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand Down Expand Up @@ -245,6 +269,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.803078146" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -267,6 +295,10 @@
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
<listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1633345790" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand Down
2 changes: 1 addition & 1 deletion .nedfolders
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
examples
src
-inet.applications.voipstream
-inet.examples.voipstream
-inet.transport.tcp_lwip
-inet.transport.tcp_nsc
-inet.examples.voipstream
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cleanall: checkmakefiles
rm -f src/Makefile

makefiles:
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
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

checkmakefiles:
@if [ ! -f src/Makefile ]; then \
Expand Down
3 changes: 2 additions & 1 deletion Makefile.vc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ cleanall: checkmakefiles
cd src && $(MAKE) -f Makefile.vc MODE=debug clean

makefiles:
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
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


checkmakefiles:
@if not exist src\Makefile.vc ( \
Expand Down
2 changes: 2 additions & 0 deletions examples/manetrouting/gpsr/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
../../../src/run_inet $*

0 comments on commit f1cb55f

Please sign in to comment.