eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed Windows 32 bit deployment on my PC

Browse source
This commit is contained in:
Volker Fischer 2020-03-24 19:40:12 +01:00
parent 8621606038
commit 232ddfcc79
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,6 +17,7 @@ moc_predefs.h
src/res/qrc_resources.cpp src/res/qrc_resources.cpp
windows/ASIOSDK2 windows/ASIOSDK2
windows/VC_redist.x64.exe windows/VC_redist.x64.exe
windows/vc_redist.x86.exe
debug/ debug/
jamulus.sln jamulus.sln
jamulus.vcxproj jamulus.vcxproj

11
windows/deploy_windows.bat
View file

@ -12,12 +12,15 @@ if "%VSINSTALLDIR%" == "" goto vsenvproblem
rem create visual studio project file ------------------------------------------ rem create visual studio project file ------------------------------------------
cd .. cd ..
rem set QMAKESPEC=win32-msvc2015 qmake -tp vc -spec win32-msvc
qmake -tp vc
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 ------------------------------------------------- rem clean and compile solution -------------------------------------------------
devenv Jamulus.vcxproj /Clean "Release|x64" devenv Jamulus.vcxproj /Clean "Release|x86"
devenv Jamulus.vcxproj /Build "Release|x64" devenv Jamulus.vcxproj /Build "Release|x86"
rem create installer ----------------------------------------------------------- rem create installer -----------------------------------------------------------
cd windows cd windows

2
windows/installer.nsi
View file

@ -6,7 +6,7 @@
!define UNINSTALL_EXE "Uninstall.exe" !define UNINSTALL_EXE "Uninstall.exe"
!define INSTALLER_NAME "Jamulusinstaller.exe" !define INSTALLER_NAME "Jamulusinstaller.exe"
!define BINARY_PATH "..\release\" !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 UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
!define AUTORUN_KEY "Software\Microsoft\Windows\CurrentVersion\Run" !define AUTORUN_KEY "Software\Microsoft\Windows\CurrentVersion\Run"