Merge branch 'master' into merge_alpha_master

retroshare-android-service/src/retroshare-android-service.pro

@@ -6,13 +6,11 @@ QT += core network
 QT -= gui
 
 CONFIG += c++11
-CONFIG += dll
+android-g++:CONFIG += dll
 
 android-g++:TEMPLATE = lib
 !android-g++:TEMPLATE = app
 
-SOURCES += service.cpp
-
 DEPENDPATH *= ../../libresapi/src
 INCLUDEPATH *= ../../libresapi/src
 PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
@@ -22,3 +20,34 @@ DEPENDPATH *= ../../libretroshare/src
 INCLUDEPATH *= ../../libretroshare/src
 PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
 LIBS *= ../../libretroshare/src/lib/libretroshare.a
+
+win32 {
+        OBJECTS_DIR = temp/obj
+
+        LIBS_DIR = $$PWD/../../libs/lib
+        LIBS += $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
+        LIBS += $$OUT_PWD/../../openpgpsdk/src/lib/libops.a
+
+        for(lib, LIB_DIR):LIBS += -L"$$lib"
+        for(bin, BIN_DIR):LIBS += -L"$$bin"
+
+
+        LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz -lws2_32
+        LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32
+        LIBS += -lwinmm
+
+        DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
+
+        DEPENDPATH += . $$INC_DIR
+        INCLUDEPATH += . $$INC_DIR
+
+        greaterThan(QT_MAJOR_VERSION, 4) {
+                # Qt 5
+                RC_INCLUDEPATH += $$_PRO_FILE_PWD_/../../libretroshare/src
+        } else {
+                # Qt 4
+                QMAKE_RC += --include-dir=$$_PRO_FILE_PWD_/../../libretroshare/src
+        }
+}
+
+SOURCES += service.cpp

retroshare-android-service/src/service.cpp

@@ -24,12 +24,10 @@
 #	include "util/androiddebug.h"
 #endif
 
-#include "retroshare/rsinit.h"
 #include "api/ApiServer.h"
 #include "api/ApiServerLocal.h"
 #include "api/RsControlModule.h"
 
-
 using namespace resource_api;
 
 int main(int argc, char *argv[])
@@ -46,7 +44,12 @@ int main(int argc, char *argv[])
 	            dynamic_cast<resource_api::ResourceRouter*>(&ctrl_mod),
 	            &resource_api::RsControlModule::handleRequest);
 
-	QString sockPath = QString::fromStdString(RsAccounts::ConfigDirectory());
+#ifdef QT_DEBUG
+	QString sockPath = "RS/";
+#else
+	QString sockPath = QCoreApplication::applicationDirPath();
+#endif
+
 	sockPath.append("/libresapi.sock");
 	qDebug() << "Listening on:" << sockPath;
 	ApiServerLocal apiServerLocal(&api, sockPath); (void) apiServerLocal;