diff --git a/.appveyor.yml b/.appveyor.yml index fe766e9..bb7dd3e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 2.0.6.{build} +version: 2.0.7.{build} pull_requests: do_not_increment_build_number: true branches: @@ -7,11 +7,27 @@ branches: skip_tags: true image: Visual Studio 2019 configuration: Release +platform: x86 +clone_script: +- cmd: git clone -q --recursive --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% environment: - matrix: - - platform: x86 - QTDIR: C:\Qt\5.13.1\msvc2017 - OUTNAME: Win32 + QTDIR: C:\Qt\5.13.2\msvc2017 build: project: GloSC.sln - verbosity: normal \ No newline at end of file + verbosity: minimal +on_success: +- cmd: >- + SET QTDIR="C:\Qt\5.13.2\msvc2017" + + + "C:\Program Files\7-Zip\7z.exe" a GloSC.zip TargetConfig.ini License.txt dependencies\minhook\MH_LICENSE.txt qt-license.txt Readme.md Build_Install.md %APPVEYOR_BUILD_FOLDER%\build\Win32\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\Win32\Release\*.dll %APPVEYOR_BUILD_FOLDER%\dependencies\SFML-2.4.2-x86\bin\sfml-system-2.dll %APPVEYOR_BUILD_FOLDER%\dependencies\SFML-2.4.2-x86\bin\sfml-window-2.dll %APPVEYOR_BUILD_FOLDER%\dependencies\SFML-2.4.2-x86\bin\sfml-graphics-2.dll redist\* %QTDIR%\bin\Qt5Core.dll %QTDIR%\bin\Qt5Gui.dll %QTDIR%\bin\Qt5Network.dll %QTDIR%\bin\Qt5Widgets.dll %QTDIR%\plugins\platforms\qwindows.dll + + + "C:\Program Files\7-Zip\7z.exe" rn GloSC.zip qwindows.dll platforms/qwindows.dll + + "C:\Program Files\7-Zip\7z.exe" rn GloSC.zip redist/ViGEmClient.dll ViGEmClient.dll + + + "C:\Program Files\7-Zip\7z.exe" rn GloSC.zip redist/libeay32.dll libeay32.dll + + "C:\Program Files\7-Zip\7z.exe" rn GloSC.zip redist/ssleay32.dll ssleay32.dll \ No newline at end of file diff --git a/.gitignore b/.gitignore index 997cdce..7148e6b 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,6 @@ ModelManifest.xml GloSC_x64\.zip GloSC\.zip +/GloSC/sfml-graphics-2.dll +/GloSC/sfml-system-2.dll +/GloSC/sfml-window-2.dll diff --git a/Build_Install.md b/Build_Install.md index 4a11bff..0479bc2 100644 --- a/Build_Install.md +++ b/Build_Install.md @@ -1,10 +1,11 @@ # Building GloSC **Build requirements:** -- M$ Visual Studio (2017) -- [Qt 5.10.1](http://info.qt.io/download-qt-for-application-development) (x86) +- M$ Visual Studio (2019, Community is fine) +- [Qt 5.13.2](http://info.qt.io/download-qt-for-application-development) (x86) - [Qt Visual Studio Tools](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools) - [ViGEm](https://github.com/nefarius/ViGEm) +- [Windows 10 SDK version 10.0.18362.0](https://go.microsoft.com/fwlink/?linkid=2083338) ViGEms user mode library as well as [SFML](http://sfml-dev.org) are bundled in the repo. For ViGEms installation refer to the Readme-files from the relevant sub-projects, or use provided install script (in redist) diff --git a/GloSC/GloSC.h b/GloSC/GloSC.h index b7fa4ce..477f4e1 100644 --- a/GloSC/GloSC.h +++ b/GloSC/GloSC.h @@ -59,7 +59,7 @@ private: QList uwp_pairs_; - constexpr static const unsigned int GLOSC_VERSION = 0x00000206; //Version Number in as bytes, just remove the dots. + constexpr static const unsigned int GLOSC_VERSION = 0x00000207; //Version Number in as bytes, just remove the dots. int wide_x_ = 711; int small_x_ = 302;