diff --git a/AppVeyor/appveyor.yml b/AppVeyor/appveyor.yml index fa1939d..08f24e2 100644 --- a/AppVeyor/appveyor.yml +++ b/AppVeyor/appveyor.yml @@ -20,7 +20,7 @@ build_script: - xcopy QtAV-depends-windows-x86+x64\* %QTDIR% /e /i /Y - qmake CONFIG+=nopkg ../KShare.pro - mingw32-make.exe -j%NUMBER_OF_PROCESSORS% - - copy release\KShare.exe ..\KShare.exe + - copy release\src\KShare.exe ..\KShare.exe - cd .. - bash AppVeyor\make_installer.sh artifacts: diff --git a/KShare.pro b/KShare.pro index 3330bde..073c15a 100644 --- a/KShare.pro +++ b/KShare.pro @@ -1,2 +1,11 @@ TEMPLATE = subdirs SUBDIRS += src + +DISTFILES += \ + README.md \ + LICENSE \ + OlderSystemFix.patch \ + AppVeyor/appveyor.yml \ + AppVeyor/make_installer.sh \ + .travis.yml \ + install.sh diff --git a/README.md b/README.md index 05e5de8..1056fbb 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ qmake # Might be qmake-qt5 on your system make ``` -On systems with FFMpeg pre-3.1 you need to apply `OlderSystemFix.patch` to `recording/encoders/encoder.cpp`. +On systems with FFMpeg pre-3.1 you need to apply `OlderSystemFix.patch` to `src/recording/encoders/encoder.cpp`. On systems with Qt pre-5.7 you need to install the Qt version from their website. You can attempt to `curl https://raw.githubusercontent.com/ArsenArsen/KShare/master/install.sh | bash` diff --git a/install.sh b/install.sh index d0ab4cd..2889c34 100755 --- a/install.sh +++ b/install.sh @@ -19,7 +19,7 @@ resultfile="$(pwd)/KShare/build/KShare.app/" elif [[ "$uname" = "Linux" ]]; then echo "Please install Qt5 GUI, Widgets, Networking, and X11 Extras, qmake, ffmpeg development files, git, and pkgconfig" sh -resultfile="$(pwd)/KShare/build/KShare" +resultfile="$(pwd)/KShare/build/src/KShare" else echo "Unsupported OS!" && exit 1; fi git clone --recursive https://github.com/ArsenArsen/KShare.git || exit 2 diff --git a/src/src.pro b/src/src.pro index 236faf1..b543436 100644 --- a/src/src.pro +++ b/src/src.pro @@ -174,15 +174,6 @@ FORMS += mainwindow.ui \ logs/historydialog.ui \ monospacetextdialog.ui -DISTFILES += \ - README.md \ - LICENSE \ - OlderSystemFix.patch \ - AppVeyor/appveyor.yml \ - AppVeyor/make_installer.sh \ - .travis.yml \ - install.sh - RESOURCES += \ icon.qrc \ translations.qrc