Update version strings, update NSIS file, move around extra files

The additional files packaged with the installer have been moved to
their own dir to separate them from the C++ source.

All licenses are now also included in the installer, as per the terms.

The version string in overlaycontroller.h has been updated to 2.8.0.
This commit is contained in:
Vasily
2019-01-04 17:06:02 +01:00
parent 14ab02f155
commit 644c887f71
8 changed files with 12 additions and 7 deletions
+1 -1
View File
@@ -9,6 +9,6 @@ Makefile*
*.stash *.stash
*.appxmanifest *.appxmanifest
*.user *.user
installer/AdvancedSettings-Installer.exe installer/*.exe
*.user* *.user*
+10 -5
View File
@@ -9,10 +9,13 @@
!define BASEDIR "..\bin\win64\AdvancedSettings" !define BASEDIR "..\bin\win64\AdvancedSettings"
!define SRCDIR "..\src" !define SRCDIR "..\src"
!define THIRDDIR "..\third-party" !define THIRDDIR "..\third-party"
!define PACKAGEDIR "..\src\package_files"
!define PROJECTDIR "..\"
!define VERSION_STRING "2-8-0"
;Name and file ;Name and file
Name "OpenVR Advanced Settings" Name "OpenVR Advanced Settings"
OutFile "AdvancedSettings-Installer.exe" OutFile "AdvancedSettings-${VERSION_STRING}-Installer.exe"
;Default installation folder ;Default installation folder
InstallDir "$PROGRAMFILES64\OpenVR-AdvancedSettings" InstallDir "$PROGRAMFILES64\OpenVR-AdvancedSettings"
@@ -103,13 +106,15 @@ Section "Install" SecInstall
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
;ADD YOUR OWN FILES HERE... ;ADD YOUR OWN FILES HERE...
File "${SRCDIR}\LICENSE.txt" File "${BASEDIR}\LICENSE-GPL.txt"
File "${BASEDIR}\LICENSE-MIT.txt"
File "${BASEDIR}\LICENSE-VALVE.txt"
File "${BASEDIR}\*.exe" File "${BASEDIR}\*.exe"
File "${THIRDDIR}\openvr\bin\win64\*.dll" File "${THIRDDIR}\openvr\bin\win64\*.dll"
File "${BASEDIR}\*.dll" File "${BASEDIR}\*.dll"
File "${SRCDIR}\*.bat" File "${PACKAGEDIR}\*.bat"
File "${SRCDIR}\*.vrmanifest" File "${PACKAGEDIR}\*.vrmanifest"
File "${SRCDIR}\*.conf" File "${PACKAGEDIR}\*.conf"
File /r "${SRCDIR}\res" File /r "${SRCDIR}\res"
File /r "${BASEDIR}\qtdata" File /r "${BASEDIR}\qtdata"
+1 -1
View File
@@ -47,7 +47,7 @@ class OverlayController : public QObject
public: public:
static constexpr const char* applicationKey = "matzman666.AdvancedSettings"; static constexpr const char* applicationKey = "matzman666.AdvancedSettings";
static constexpr const char* applicationName = "Advanced Settings"; static constexpr const char* applicationName = "Advanced Settings";
static constexpr const char* applicationVersionString = "v2.5"; static constexpr const char* applicationVersionString = "v2.8.0";
private: private:
vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid; vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;