From 7da348935077194df96e0a437ed001fb747ea59f Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Thu, 2 Jan 2014 10:11:35 +0000 Subject: [PATCH] fixes for Qt 5.2 --- windows/deploy_windows.bat | 7 +++++++ windows/installer.nsi | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/windows/deploy_windows.bat b/windows/deploy_windows.bat index 741161dc..4466f1cb 100755 --- a/windows/deploy_windows.bat +++ b/windows/deploy_windows.bat @@ -10,6 +10,13 @@ cd .. set QMAKESPEC=win32-msvc2010 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 "None" > Jamulus.vcxproj + + rem clean and compile solution ------------------------------------------------- vcexpress Jamulus.vcxproj /clean "Release|Win32" vcexpress Jamulus.vcxproj /build "Release|Win32" diff --git a/windows/installer.nsi b/windows/installer.nsi index 8896b54b..3e0d6490 100755 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -52,9 +52,9 @@ Section File "$%QTDIR%\bin\Qt5Network.dll" File "$%QTDIR%\bin\Qt5Xml.dll" File "$%QTDIR%\bin\D3DCompiler_43.dll" - File "$%QTDIR%\bin\icudt49.dll" - File "$%QTDIR%\bin\icuin49.dll" - File "$%QTDIR%\bin\icuuc49.dll" + File "$%QTDIR%\bin\icudt51.dll" + File "$%QTDIR%\bin\icuin51.dll" + File "$%QTDIR%\bin\icuuc51.dll" File "$%QTDIR%\bin\libEGL.dll" File "$%QTDIR%\bin\libGLESv2.dll" @@ -112,9 +112,9 @@ Delete $INSTDIR\Qt5Widgets.dll Delete $INSTDIR\Qt5Network.dll Delete $INSTDIR\Qt5Xml.dll Delete $INSTDIR\D3DCompiler_43.dll -Delete $INSTDIR\icudt49.dll -Delete $INSTDIR\icuin49.dll -Delete $INSTDIR\icuuc49.dll +Delete $INSTDIR\icudt51.dll +Delete $INSTDIR\icuin51.dll +Delete $INSTDIR\icuuc51.dll Delete $INSTDIR\libEGL.dll Delete $INSTDIR\libGLESv2.dll Delete $INSTDIR\COPYING