fixed includes/libs

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7245 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/tests/network_simulator/gui/NetworkViewer.cpp

@@ -4,7 +4,7 @@
 
 #include <retroshare/rsids.h>
 
-#include "Network.h"
+#include "nscore/Network.h"
 #include "NetworkViewer.h"
 
 NetworkViewer::NetworkViewer(QWidget *parent,Network&net)

libretroshare/src/tests/network_simulator/gui/NetworkViewer.h

@@ -19,7 +19,7 @@
 // 5 - perturbate the network 
 // 		* change the load of each node, and the delay when forwarding requests.
 //
-#include "Network.h"
+#include "nscore/Network.h"
 
 class NetworkViewer: public QGLViewer
 {

libretroshare/src/tests/network_simulator/gui/gui.pro

@@ -3,7 +3,7 @@ TEMPLATE = app
 CONFIG *= qt qglviewer 
 QT *= xml opengl
 
-INCLUDEPATH *= ../.. ..
+INCLUDEPATH *= ../../.. ..
 
 TARGET = NetworkSim
 DESTDIR = bin
@@ -16,4 +16,9 @@ HEADERS = NetworkViewer.h NetworkSimulatorGUI.h \
 
 FORMS = NetworkSimulatorGUI.ui TurtleRouterStatistics.ui
 
-LIBS *= ../../../lib/libretroshare.a ../../../../../libbitdht/src/lib/libbitdht.a ../../../../../../lib/sqlcipher/.libs/libsqlcipher.a   ../../../../../openpgpsdk/src/lib/libops.a -lgnome-keyring -lupnp -lssl -lcrypto -lbz2 -lixml
+LIBS *= ../../../lib/libretroshare.a \
+        ../../../../../libbitdht/src/lib/libbitdht.a \
+		  ../../../../../../lib/sqlcipher/.libs/libsqlcipher.a   \
+		  ../../../../../openpgpsdk/src/lib/libops.a \
+		  ../lib/libnscore.a \
+		  -lgnome-keyring -lupnp -lssl -lcrypto -lbz2 -lixml

libretroshare/src/tests/network_simulator/gui/main.cpp

@@ -1,11 +1,13 @@
 #include <fenv.h>
-
-#include "Network.h"
-#include "NetworkSimulatorGUI.h"
-#include "MonitoredRsPeers.h"
-#include <QApplication>
 #include <util/argstream.h>
 
+#include "nscore/Network.h"
+#include "nscore/MonitoredRsPeers.h"
+
+#include <QApplication>
+
+#include "NetworkSimulatorGUI.h"
+
 int main(int argc, char *argv[])
 {
 	feenableexcept(FE_INVALID) ;