merge src/simulator into src/core; move src/core to new module layout

This commit is contained in:
Tom Henderson committed 2011-02-18 16:05:39 -08:00
1 parent 9471e3121f
commit df07734f32
241 files changed
+358 -386

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@
#include <fstream>
#include "ns3/core-module.h"
#include "ns3/common-module.h"
#include "ns3/simulator-module.h"
#include "ns3/core-module.h"
#include "ns3/node-module.h"
#include "ns3/helper-module.h"
+1 -1
View File
@@ -15,7 +15,7 @@
*/
#include "ns3/core-module.h"
#include "ns3/simulator-module.h"
#include "ns3/core-module.h"
#include "ns3/node-module.h"
#include "ns3/helper-module.h"
+1 -1
View File
@@ -15,7 +15,7 @@
*/
#include "ns3/core-module.h"
#include "ns3/simulator-module.h"
#include "ns3/core-module.h"
#include "ns3/node-module.h"
#include "ns3/helper-module.h"
#include "ns3/ipv4-global-routing-helper.h"
+1 -1
View File
@@ -17,7 +17,7 @@
#include <fstream>
#include "ns3/core-module.h"
#include "ns3/common-module.h"
#include "ns3/simulator-module.h"
#include "ns3/core-module.h"
#include "ns3/node-module.h"
#include "ns3/helper-module.h"
+1 -1
View File
@@ -15,7 +15,7 @@
*/
#include "ns3/core-module.h"
#include "ns3/simulator-module.h"
#include "ns3/core-module.h"
#include "ns3/node-module.h"
#include "ns3/helper-module.h"
#include "ns3/wifi-module.h"
+5 -5
View File
@@ -4,20 +4,20 @@ def build(bld):
obj = bld.create_ns3_program('hello-simulator', ['core'])
obj.source = 'hello-simulator.cc'
obj = bld.create_ns3_program('first', ['core', 'simulator', 'point-to-point', 'internet-stack'])
obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet-stack'])
obj.source = 'first.cc'
obj = bld.create_ns3_program('second', ['core', 'simulator', 'point-to-point', 'csma', 'internet-stack'])
obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet-stack'])
obj.source = 'second.cc'
obj = bld.create_ns3_program('third', ['core', 'simulator', 'point-to-point', 'csma', 'wifi', 'internet-stack'])
obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet-stack'])
obj.source = 'third.cc'
obj = bld.create_ns3_program('fourth', ['core'])
obj.source = 'fourth.cc'
obj = bld.create_ns3_program('fifth', ['core', 'simulator', 'point-to-point', 'internet-stack'])
obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet-stack'])
obj.source = 'fifth.cc'
obj = bld.create_ns3_program('sixth', ['core', 'simulator', 'point-to-point', 'internet-stack'])
obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet-stack'])
obj.source = 'sixth.cc'