Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenMesh
OpenMesh
Commits
8c6cb2b6
Commit
8c6cb2b6
authored
Sep 27, 2018
by
Jan Möbius
Browse files
Merge branch 'Move_to_Qt-5.7_for_VS2013' into 'master'
Move to qt 5.7 for vs2013 See merge request
!183
parents
24d8828b
1e631a52
Changes
1
Hide whitespace changes
Inline
Side-by-side
CI/Windows.bat
View file @
8c6cb2b6
...
...
@@ -38,13 +38,13 @@ IF "%BUILD_PLATFORM%" == "VS2013" (
set
GENERATOR
=
Visual
Studio
12
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.
3.1
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013_64
_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.
3.1
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013_64
_opengl
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.
7.0
\5.
7
\msvc2013_64
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.
7.0
\5.
7
\msvc2013_64
)
IF
"
%ARCHITECTURE%
"
==
"x32"
(
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.
3.1
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013
_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.
3.1
-vs
2013
-
%STRING_ARCH%
\5.
3
\msvc2013
_opengl
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.
7.0
\5.
7
\msvc2013
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.
7.0
\5.
7
\msvc2013
)
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment