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

fixes for new Qt version and new Visual Studio compiler (VS 2015)

Browse source
This commit is contained in:
Volker Fischer 2016-05-11 15:44:16 +00:00
parent fd69efb060
commit 4cbee9d1d5
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
windows/deploy_windows.bat
View file

@ -1,25 +1,23 @@
@echo off @echo off
rem To set up a new Qt and Visual Studio version
rem - set environment path variable to the correct Qt bin directory (e.g. 32 bit version)
rem - if using Visual Studio Express version, download the redistributable (it is not automatically there)
rem - change the Qt distribute dll names in the installer.nsi file (some contain version numbers)
rem settings and check --------------------------------------------------------- rem settings and check ---------------------------------------------------------
set NSIS_PATH=%PROGRAMFILES%\NSIS set NSIS_PATH=%PROGRAMFILES(x86)%\NSIS
if "%VSINSTALLDIR%" == "" goto vsenvproblem if "%VSINSTALLDIR%" == "" goto vsenvproblem
rem create visual studio project file ------------------------------------------ rem create visual studio project file ------------------------------------------
cd .. cd ..
set QMAKESPEC=win32-msvc2010 set QMAKESPEC=win32-msvc2015
qmake -tp vc qmake -tp vc
rem TODO Qt 5.2 qmake inserts a line in the project file which does not compile on msvc2010
rem -> as a workaround we remove that line here
copy Jamulus.vcxproj JamulusUnmod.vcxproj
type JamulusUnmod.vcxproj | findstr /v "<DebugInformationFormat>None</DebugInformationFormat>" > Jamulus.vcxproj
rem clean and compile solution ------------------------------------------------- rem clean and compile solution -------------------------------------------------
vcexpress Jamulus.vcxproj /clean "Release|Win32" devenv Jamulus.vcxproj /Clean "Release|x86"
vcexpress Jamulus.vcxproj /build "Release|Win32" devenv Jamulus.vcxproj /Build "Release|x86"
rem create installer ----------------------------------------------------------- rem create installer -----------------------------------------------------------
cd windows cd windows

20
windows/installer.nsi
View file

@ -6,8 +6,8 @@
!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_PATH "C:\Program Files\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\" ;!define VS_REDIST_PATH "C:\Program Files (x86)\Microsoft Visual Studio 14.0\SDK\Bootstrapper\Packages\vcredist_x86\"
;!define VS_REDIST_PATH "C:\Programme\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\" !define VS_REDIST_PATH "C:\Programme\Microsoft Visual Studio 14.0\SDK\Bootstrapper\Packages\vcredist_x86\"
!define VS_REDIST_EXE "vcredist_x86.exe" !define VS_REDIST_EXE "vcredist_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"
@ -51,10 +51,10 @@ Section
File "$%QTDIR%\bin\Qt5Widgets.dll" File "$%QTDIR%\bin\Qt5Widgets.dll"
File "$%QTDIR%\bin\Qt5Network.dll" File "$%QTDIR%\bin\Qt5Network.dll"
File "$%QTDIR%\bin\Qt5Xml.dll" File "$%QTDIR%\bin\Qt5Xml.dll"
File "$%QTDIR%\bin\D3DCompiler_43.dll" File "$%QTDIR%\bin\D3DCompiler_47.dll"
File "$%QTDIR%\bin\icudt51.dll" File "$%QTDIR%\bin\icudt54.dll"
File "$%QTDIR%\bin\icuin51.dll" File "$%QTDIR%\bin\icuin54.dll"
File "$%QTDIR%\bin\icuuc51.dll" File "$%QTDIR%\bin\icuuc54.dll"
File "$%QTDIR%\bin\libEGL.dll" File "$%QTDIR%\bin\libEGL.dll"
File "$%QTDIR%\bin\libGLESv2.dll" File "$%QTDIR%\bin\libGLESv2.dll"
@ -111,10 +111,10 @@ Delete $INSTDIR\Qt5Gui.dll
Delete $INSTDIR\Qt5Widgets.dll Delete $INSTDIR\Qt5Widgets.dll
Delete $INSTDIR\Qt5Network.dll Delete $INSTDIR\Qt5Network.dll
Delete $INSTDIR\Qt5Xml.dll Delete $INSTDIR\Qt5Xml.dll
Delete $INSTDIR\D3DCompiler_43.dll Delete $INSTDIR\D3DCompiler_47.dll
Delete $INSTDIR\icudt51.dll Delete $INSTDIR\icudt54.dll
Delete $INSTDIR\icuin51.dll Delete $INSTDIR\icuin54.dll
Delete $INSTDIR\icuuc51.dll Delete $INSTDIR\icuuc54.dll
Delete $INSTDIR\libEGL.dll Delete $INSTDIR\libEGL.dll
Delete $INSTDIR\libGLESv2.dll Delete $INSTDIR\libGLESv2.dll
Delete $INSTDIR\COPYING Delete $INSTDIR\COPYING

3
windows/sound.cpp
View file

@ -435,7 +435,8 @@ CSound::CSound ( void (*fpNewCallback) ( CVector<int16_t>& psData, void* arg ),
cDriverNames[i] = new char[32]; cDriverNames[i] = new char[32];
} }
loadAsioDriver ( "dummy" ); // to initialize external object char cDummyName[] = "dummy";
loadAsioDriver ( cDummyName ); // to initialize external object
lNumDevs = asioDrivers->getDriverNames ( cDriverNames, MAX_NUMBER_SOUND_CARDS ); lNumDevs = asioDrivers->getDriverNames ( cDriverNames, MAX_NUMBER_SOUND_CARDS );
// in case we do not have a driver available, throw error // in case we do not have a driver available, throw error