Skip to content

Commit

Permalink
Windows|Installer|qmake: Switched to VS 2013 and Qt 5
Browse files Browse the repository at this point in the history
The autobuilder now uses VS 2013 and Qt 5 when building the Windows
distribution packages.

The Qt 4 shared libraries are deleted by Inno Setup when installing
a new release.
  • Loading branch information
skyjake committed Jul 17, 2014
1 parent ab01f42 commit c1f4ff5
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 9 deletions.
2 changes: 1 addition & 1 deletion distrib/win32/dorel.bat
Expand Up @@ -21,7 +21,7 @@ SET BUILDFAILURE=0
rd/s/q work
md work
cd work
qmake -spec win32-msvc2010 ..\..\..\doomsday\doomsday.pro CONFIG+=release DENG_BUILD=%DOOMSDAY_BUILD%
qmake -spec win32-msvc2013 ..\..\..\doomsday\doomsday.pro CONFIG+=release DENG_BUILD=%DOOMSDAY_BUILD%
IF NOT %ERRORLEVEL% == 0 SET BUILDFAILURE=1
%JOM%
IF NOT %ERRORLEVEL% == 0 SET BUILDFAILURE=1
Expand Down
31 changes: 26 additions & 5 deletions distrib/win32/setup.iss.template
Expand Up @@ -51,6 +51,11 @@ Name: "{app}\doc"

; Obsolete files which should be removed if present when upgrading.
[InstallDelete]
Type: files; Name: "{app}\bin\QtCore4.dll"
Type: files; Name: "{app}\bin\QtGui4.dll"
Type: files; Name: "{app}\bin\QtNetwork4.dll"
Type: files; Name: "{app}\bin\QtOpenGL4.dll"
Type: files; Name: "{app}\bin\imageformats\qjpeg4.dll"
Type: files; Name: "{app}\bin\SDL.dll"
Type: files; Name: "{app}\bin\SDL_mixer.dll"
Type: files; Name: "{app}\bin\mikmod.dll"
Expand Down Expand Up @@ -104,11 +109,27 @@ Source: "bin\deng_core.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Compone
Source: "bin\deng_gui.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\deng_legacy.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\deng_shell.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\QtOpenGL4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\imageformats\qjpeg4.dll"; DestDir: "{app}\bin\imageformats"; Flags: ignoreversion; Components: Engine

; Qt 4
; Source: "bin\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
; Source: "bin\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
; Source: "bin\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
; Source: "bin\QtOpenGL4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
; Source: "bin\imageformats\qjpeg4.dll"; DestDir: "{app}\bin\imageformats"; Flags: ignoreversion; Components: Engine

; Qt 5
Source: "bin\Qt5Core.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\Qt5Gui.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\Qt5Network.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\Qt5OpenGL.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\Qt5Widgets.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\icuin52.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\icuuc52.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\icudt52.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\imageformats\qjpeg.dll"; DestDir: "{app}\bin\imageformats"; Flags: ignoreversion; Components: Engine
Source: "bin\imageformats\qico.dll"; DestDir: "{app}\bin\imageformats"; Flags: ignoreversion; Components: Engine
Source: "bin\imageformats\qgif.dll"; DestDir: "{app}\bin\imageformats"; Flags: ignoreversion; Components: Engine

Source: "bin\assimp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\OpenAL32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "bin\eax.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Expand Down
10 changes: 7 additions & 3 deletions doomsday/build/win32/envconfig-example.bat
Expand Up @@ -4,10 +4,12 @@

:: Directory Config -------------------------------------------------------

set ENVCONFIG_DIR=%CD%

:: Modify these paths for your system.
set MSVC_DIR=c:\Program Files\Microsoft Visual Studio 10.0
set MSVC_DIR=c:\Program Files\Microsoft Visual Studio 12.0
set QTCREATOR_DIR=c:\Qt\Qt5.3.1\Tools\QtCreator
set QT_BIN_DIR=c:\Qt\4.8.6\bin
set QT_BIN_DIR=C:\Qt\Qt5.3.1\5.3\msvc2013_opengl\bin

:: Build Tools Setup ------------------------------------------------------

Expand All @@ -16,4 +18,6 @@ call "%MSVC_DIR%\vc\vcvarsall.bat"

:: -- Qt environment.
set JOM=%QTCREATOR_DIR%\bin\jom.exe /nologo
call "%QT_BIN_DIR%\qtvars.bat"
call "%QT_BIN_DIR%\qtenv2.bat"

cd %ENVCONFIG_DIR%

0 comments on commit c1f4ff5

Please sign in to comment.