diff --git a/RetroShare.pro b/RetroShare.pro index a1283a1bb..a54336847 100644 --- a/RetroShare.pro +++ b/RetroShare.pro @@ -45,15 +45,25 @@ libresapi { retroshare_gui { SUBDIRS += retroshare_gui retroshare_gui.file = retroshare-gui/src/retroshare-gui.pro - retroshare_gui.depends = libretroshare libresapi retroshare_gui.target = retroshare_gui + + libresapi { + retroshare_gui.depends = libresapi + } else { + retroshare_gui.depends = libretroshare + } } retroshare_nogui { SUBDIRS += retroshare_nogui retroshare_nogui.file = retroshare-nogui/src/retroshare-nogui.pro - retroshare_nogui.depends = libretroshare libresapi retroshare_nogui.target = retroshare_nogui + + libresapi { + retroshare_gui.depends = libresapi + } else { + retroshare_gui.depends = libretroshare + } } retroshare_android_service { diff --git a/build_scripts/Android/prepare-toolchain-clang.sh b/build_scripts/Android/prepare-toolchain-clang.sh index 0e9fdb7f7..158d3b28a 100755 --- a/build_scripts/Android/prepare-toolchain-clang.sh +++ b/build_scripts/Android/prepare-toolchain-clang.sh @@ -329,6 +329,6 @@ build_sqlite build_sqlcipher build_libupnp build_rapidjson -build_restbed +#build_restbed # qmake build it already echo NATIVE_LIBS_TOOLCHAIN_PATH=${NATIVE_LIBS_TOOLCHAIN_PATH} diff --git a/data/retroshare.svg b/data/retroshare.svg new file mode 100644 index 000000000..403f4fb52 --- /dev/null +++ b/data/retroshare.svg @@ -0,0 +1,263 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 3f9d13331..0bbc52969 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -890,7 +890,8 @@ rs_jsonapi { git submodule update --init --recommend-shallow dependency/catch;\ git submodule update --init --recommend-shallow dependency/kashmir;\ mkdir -p $${RESTBED_BUILD_PATH}; cd $${RESTBED_BUILD_PATH};\ - cmake -DBUILD_SSL=OFF -DCMAKE_INSTALL_PREFIX=. -B. -H$$shell_path($${RESTBED_SRC_PATH});\ + cmake -DCMAKE_CXX_COMPILER=$$QMAKE_CXX -DBUILD_SSL=OFF \ + -DCMAKE_INSTALL_PREFIX=. -B. -H$$shell_path($${RESTBED_SRC_PATH});\ make; make install QMAKE_EXTRA_TARGETS += restbed libretroshare.depends += restbed diff --git a/retroshare-service/data/retroshare-service.desktop b/retroshare-service/data/retroshare-service.desktop new file mode 100644 index 000000000..5d077597b --- /dev/null +++ b/retroshare-service/data/retroshare-service.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Name=RetroShare System Service +Comment=Securely share files with your friends (system service) +Exec=retroshare-service %U +Icon=retroshare-service +Terminal=false +Type=Application +Categories=Application;Network; diff --git a/retroshare-service/data/retroshare-service.svg b/retroshare-service/data/retroshare-service.svg new file mode 100644 index 000000000..74e38942a --- /dev/null +++ b/retroshare-service/data/retroshare-service.svg @@ -0,0 +1,188 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/retroshare-service/src/retroshare-service.inkscape.svg b/retroshare-service/src/retroshare-service.inkscape.svg new file mode 100644 index 000000000..911297753 --- /dev/null +++ b/retroshare-service/src/retroshare-service.inkscape.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/retroshare-service/src/retroshare-service.pro b/retroshare-service/src/retroshare-service.pro index e1911f179..5574cbabc 100644 --- a/retroshare-service/src/retroshare-service.pro +++ b/retroshare-service/src/retroshare-service.pro @@ -14,14 +14,26 @@ android-* { DISTFILES += android/AndroidManifest.xml \ android/res/drawable/retroshare_128x128.png \ - android/res/drawable/retroshare_retroshare_48x48.png + android/res/drawable/retroshare_retroshare_48x48.png \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat } -DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat +appimage { + icon_files.path = "$${PREFIX}/share/icons/hicolor/scalable/" + icon_files.files = ../data/retroshare-service.svg + INSTALLS += icon_files + + desktop_files.path = "$${PREFIX}/share/applications" + desktop_files.files = ../data/retroshare-service.desktop + INSTALLS += desktop_files +} + +unix { + target.path = "$${RS_BIN_DIR}" + INSTALLS += target +}