fixed Windows 32 bit deployment on my PC
This commit is contained in:
parent
8621606038
commit
232ddfcc79
3 changed files with 9 additions and 5 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -17,6 +17,7 @@ moc_predefs.h
|
|||
src/res/qrc_resources.cpp
|
||||
windows/ASIOSDK2
|
||||
windows/VC_redist.x64.exe
|
||||
windows/vc_redist.x86.exe
|
||||
debug/
|
||||
jamulus.sln
|
||||
jamulus.vcxproj
|
||||
|
|
|
@ -12,12 +12,15 @@ if "%VSINSTALLDIR%" == "" goto vsenvproblem
|
|||
|
||||
rem create visual studio project file ------------------------------------------
|
||||
cd ..
|
||||
rem set QMAKESPEC=win32-msvc2015
|
||||
qmake -tp vc
|
||||
qmake -tp vc -spec win32-msvc
|
||||
|
||||
rem TODO qmake seems to use the incorrect VS version to create the project file.
|
||||
rem As a quick hack I simply replace the toolset version which seems to work.
|
||||
powershell -Command "(gc jamulus.vcxproj) -replace '<PlatformToolset>v141</PlatformToolset>', '<PlatformToolset>v140</PlatformToolset>' | Out-File -encoding ASCII jamulus.vcxproj"
|
||||
|
||||
rem clean and compile solution -------------------------------------------------
|
||||
devenv Jamulus.vcxproj /Clean "Release|x64"
|
||||
devenv Jamulus.vcxproj /Build "Release|x64"
|
||||
devenv Jamulus.vcxproj /Clean "Release|x86"
|
||||
devenv Jamulus.vcxproj /Build "Release|x86"
|
||||
|
||||
rem create installer -----------------------------------------------------------
|
||||
cd windows
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
!define UNINSTALL_EXE "Uninstall.exe"
|
||||
!define INSTALLER_NAME "Jamulusinstaller.exe"
|
||||
!define BINARY_PATH "..\release\"
|
||||
!define VS_REDIST_EXE "VC_redist.x64.exe"
|
||||
!define VS_REDIST_EXE "vc_redist.x86.exe"
|
||||
!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
|
||||
!define AUTORUN_KEY "Software\Microsoft\Windows\CurrentVersion\Run"
|
||||
|
||||
|
|
Loading…
Reference in a new issue