Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-10 01:55:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Linker problem

Browse source
This commit is contained in:
Konrad 2017-04-01 14:28:55 +02:00
parent fbc1bb4e82
commit 8543525c77
2 changed files with 10 additions and 12 deletions
retroshare-android-service/src
retroshare-android-service.proservice.cpp

20
retroshare-android-service/src/retroshare-android-service.pro
View file

@ -11,6 +11,16 @@ android-g++:CONFIG += dll
android-g++:TEMPLATE = lib
!android-g++:TEMPLATE = app
DEPENDPATH *= ../../libresapi/src
INCLUDEPATH *= ../../libresapi/src
PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
LIBS *= ../../libresapi/src/lib/libresapi.a
DEPENDPATH *= ../../libretroshare/src
INCLUDEPATH *= ../../libretroshare/src
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
LIBS *= ../../libretroshare/src/lib/libretroshare.a
win32 {
OBJECTS_DIR = temp/obj
@ -41,13 +51,3 @@ win32 {
}
SOURCES += service.cpp
DEPENDPATH *= ../../libresapi/src
INCLUDEPATH *= ../../libresapi/src
PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
LIBS *= ../../libresapi/src/lib/libresapi.a
DEPENDPATH *= ../../libretroshare/src
INCLUDEPATH *= ../../libretroshare/src
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
LIBS *= ../../libretroshare/src/lib/libretroshare.a

2
retroshare-android-service/src/service.cpp
View file

@ -40,8 +40,6 @@ int main(int argc, char *argv[])
QCoreApplication a(argc, argv);
RsInit::InitRsConfig();
ApiServer api;
RsControlModule ctrl_mod(argc, argv, api.getStateTokenServer(), &api, true);
api.addResourceHandler("control", dynamic_cast<resource_api::ResourceRouter*>(&ctrl_mod), &resource_api::RsControlModule::handleRequest);