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

fixes for Qt 5.2

Browse source
This commit is contained in:
Volker Fischer 2014-01-02 10:11:35 +00:00
parent ac10994d5c
commit 7da3489350
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
windows/deploy_windows.bat
View file

@ -10,6 +10,13 @@ cd ..
set QMAKESPEC=win32-msvc2010 set QMAKESPEC=win32-msvc2010
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" vcexpress Jamulus.vcxproj /clean "Release|Win32"
vcexpress Jamulus.vcxproj /build "Release|Win32" vcexpress Jamulus.vcxproj /build "Release|Win32"

12
windows/installer.nsi
View file

@ -52,9 +52,9 @@ Section
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_43.dll"
File "$%QTDIR%\bin\icudt49.dll" File "$%QTDIR%\bin\icudt51.dll"
File "$%QTDIR%\bin\icuin49.dll" File "$%QTDIR%\bin\icuin51.dll"
File "$%QTDIR%\bin\icuuc49.dll" File "$%QTDIR%\bin\icuuc51.dll"
File "$%QTDIR%\bin\libEGL.dll" File "$%QTDIR%\bin\libEGL.dll"
File "$%QTDIR%\bin\libGLESv2.dll" File "$%QTDIR%\bin\libGLESv2.dll"
@ -112,9 +112,9 @@ 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_43.dll
Delete $INSTDIR\icudt49.dll Delete $INSTDIR\icudt51.dll
Delete $INSTDIR\icuin49.dll Delete $INSTDIR\icuin51.dll
Delete $INSTDIR\icuuc49.dll Delete $INSTDIR\icuuc51.dll
Delete $INSTDIR\libEGL.dll Delete $INSTDIR\libEGL.dll
Delete $INSTDIR\libGLESv2.dll Delete $INSTDIR\libGLESv2.dll
Delete $INSTDIR\COPYING Delete $INSTDIR\COPYING