Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

build: fixed top level makefiles to be in sync with features enabled …

…by default in the project file.
  • Loading branch information...
commit 9dfe810ceac1b3bf0f80da768a66150ec0017c9d 1 parent 2e173d3
Rudolf Hornig rhornig authored
Showing with 26 additions and 26 deletions.
  1. +22 −22 .cproject
  2. +2 −2 .project
  3. +1 −1  Makefile
  4. +1 −1  Makefile.vc
44 .cproject
View
@@ -81,19 +81,19 @@
</tool>
</toolChain>
</folderInfo>
- <folderInfo id="org.omnetpp.cdt.gnu.config.debug.1590007136.1915469051" name="/" resourcePath="src">
- <toolChain id="org.omnetpp.cdt.gnu.toolchain.debug.151038819" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.debug" unusedChildren="">
- <tool id="cdt.managedbuild.tool.gnu.archiver.base.987895542" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base.447573921"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.228690498" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base.456466295">
- <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1804174460" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+ <folderInfo id="org.omnetpp.cdt.gnu.config.debug.1590007136.193330041" name="/" resourcePath="src">
+ <toolChain id="org.omnetpp.cdt.gnu.toolchain.debug.1490305122" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.debug" unusedChildren="">
+ <tool id="cdt.managedbuild.tool.gnu.archiver.base.999386074" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base.447573921"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.776168229" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base.456466295">
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1082500692" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1242973452" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base.866720212">
- <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1541602674" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.903172043" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base.866720212">
+ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.2035757735" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.linker.base.1264347575" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base.1828265921"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.850523057" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base.423181083"/>
- <tool id="cdt.managedbuild.tool.gnu.assembler.base.1755497456" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base.1249982740">
- <inputType id="cdt.managedbuild.tool.gnu.assembler.input.876655832" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.c.linker.base.1222369218" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base.1828265921"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.788401769" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base.423181083"/>
+ <tool id="cdt.managedbuild.tool.gnu.assembler.base.1374614873" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base.1249982740">
+ <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1635859507" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
@@ -177,19 +177,19 @@
</tool>
</toolChain>
</folderInfo>
- <folderInfo id="org.omnetpp.cdt.gnu.config.release.960890479.902065584" name="/" resourcePath="src">
- <toolChain id="org.omnetpp.cdt.gnu.toolchain.release.327713043" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.release" unusedChildren="">
- <tool id="cdt.managedbuild.tool.gnu.archiver.base.170337308" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base.879724210"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.2034474051" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base.209048065">
- <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2122852078" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+ <folderInfo id="org.omnetpp.cdt.gnu.config.release.960890479.2043134594" name="/" resourcePath="src">
+ <toolChain id="org.omnetpp.cdt.gnu.toolchain.release.1311059427" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.release" unusedChildren="">
+ <tool id="cdt.managedbuild.tool.gnu.archiver.base.534894432" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base.879724210"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.146949126" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base.209048065">
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1828667211" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1939524461" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base.592637975">
- <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.244055791" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.c.compiler.base.20459099" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base.592637975">
+ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1369749728" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
- <tool id="cdt.managedbuild.tool.gnu.c.linker.base.556890302" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base.1299139491"/>
- <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1447499357" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base.869621795"/>
- <tool id="cdt.managedbuild.tool.gnu.assembler.base.960452794" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base.1340309855">
- <inputType id="cdt.managedbuild.tool.gnu.assembler.input.364056555" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+ <tool id="cdt.managedbuild.tool.gnu.c.linker.base.2093289545" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base.1299139491"/>
+ <tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.411283877" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base.869621795"/>
+ <tool id="cdt.managedbuild.tool.gnu.assembler.base.526047110" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base.1340309855">
+ <inputType id="cdt.managedbuild.tool.gnu.assembler.input.994821788" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
4 .project
View
@@ -21,7 +21,7 @@
<arguments>
<dictionary>
<key>?children?</key>
- <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|\||</value>
+ <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
</dictionary>
<dictionary>
<key>?name?</key>
@@ -37,7 +37,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
- <value>MODE=debug CONFIGNAME=${ConfigName} -j2</value>
+ <value>MODE=debug CONFIGNAME=${ConfigName}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
2  Makefile
View
@@ -10,7 +10,7 @@ cleanall: checkmakefiles
rm -f src/Makefile
makefiles:
- cd src && opp_makemake -f --deep --make-so -o inet -O out -Xapplications/voiptool -Xnetworklayer/ipv6tunneling -Xnetworklayer/xmipv6 -Xnodes/xmipv6 -Xtransport/tcp_nsc -DWITH_TCP_COMMON -DWITH_TCP_INET -DWITH_TCP_LWIP -DWITH_IPv4 -DWITH_IPv6 -DWITH_UDP -DWITH_RTP -DWITH_SCTP -DWITH_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_MANET
+ cd src && opp_makemake -f --deep --make-so -o inet -O out -pINET -Xapplications/voiptool -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_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_MANET
checkmakefiles:
@if [ ! -f src/Makefile ]; then \
2  Makefile.vc
View
@@ -9,7 +9,7 @@ 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 -Xapplications/voiptool -Xnetworklayer/ipv6tunneling -Xnetworklayer/xmipv6 -Xnodes/xmipv6 -Xtransport/tcp_nsc -DWITH_TCP_COMMON -DWITH_TCP_INET -DWITH_TCP_LWIP -DWITH_IPv4 -DWITH_IPv6 -DWITH_UDP -DWITH_RTP -DWITH_SCTP -DWITH_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_MANET
+ cd src && call opp_nmakemake -f --deep --make-so -o inet -O out -pINET -Xapplications/voiptool -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_ETHERNET -DWITH_PPP -DWITH_EXT_IF -DWITH_MPLS -DWITH_OSPFv2 -DWITH_BGPv4 -DWITH_MANET
checkmakefiles:
@if not exist src\Makefile.vc ( \
Please sign in to comment.
Something went wrong with that request. Please try again.