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:
+1
-1
@@ -9,6 +9,6 @@ Makefile*
|
||||
*.stash
|
||||
*.appxmanifest
|
||||
*.user
|
||||
installer/AdvancedSettings-Installer.exe
|
||||
installer/*.exe
|
||||
*.user*
|
||||
|
||||
|
||||
+10
-5
@@ -9,10 +9,13 @@
|
||||
!define BASEDIR "..\bin\win64\AdvancedSettings"
|
||||
!define SRCDIR "..\src"
|
||||
!define THIRDDIR "..\third-party"
|
||||
!define PACKAGEDIR "..\src\package_files"
|
||||
!define PROJECTDIR "..\"
|
||||
!define VERSION_STRING "2-8-0"
|
||||
|
||||
;Name and file
|
||||
Name "OpenVR Advanced Settings"
|
||||
OutFile "AdvancedSettings-Installer.exe"
|
||||
OutFile "AdvancedSettings-${VERSION_STRING}-Installer.exe"
|
||||
|
||||
;Default installation folder
|
||||
InstallDir "$PROGRAMFILES64\OpenVR-AdvancedSettings"
|
||||
@@ -103,13 +106,15 @@ Section "Install" SecInstall
|
||||
SetOutPath "$INSTDIR"
|
||||
|
||||
;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 "${THIRDDIR}\openvr\bin\win64\*.dll"
|
||||
File "${BASEDIR}\*.dll"
|
||||
File "${SRCDIR}\*.bat"
|
||||
File "${SRCDIR}\*.vrmanifest"
|
||||
File "${SRCDIR}\*.conf"
|
||||
File "${PACKAGEDIR}\*.bat"
|
||||
File "${PACKAGEDIR}\*.vrmanifest"
|
||||
File "${PACKAGEDIR}\*.conf"
|
||||
File /r "${SRCDIR}\res"
|
||||
File /r "${BASEDIR}\qtdata"
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ class OverlayController : public QObject
|
||||
public:
|
||||
static constexpr const char* applicationKey = "matzman666.AdvancedSettings";
|
||||
static constexpr const char* applicationName = "Advanced Settings";
|
||||
static constexpr const char* applicationVersionString = "v2.5";
|
||||
static constexpr const char* applicationVersionString = "v2.8.0";
|
||||
|
||||
private:
|
||||
vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;
|
||||
|
||||
Reference in New Issue
Block a user