Author: jghali
Date: Sun Nov 8 19:34:37 2020
New Revision: 24214
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24214
Log:
Update msvc project to Python 2.7.18 in order to match latest uploaded library
packages
Modified:
branches/Version14x/Scribus/win32/msvc2008/Scribus-build-props.vsprops
branches/Version14x/Scribus/win32/msvc2012/Scribus-build-props.props
branches/Version14x/Scribus/win32/msvc2013/Scribus-build-props.props
branches/Version14x/Scribus/win32/msvc2015/Scribus-build-props.props
Modified: branches/Version14x/Scribus/win32/msvc2008/Scribus-build-props.vsprops
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24214&path=/branches/Version14x/Scribus/win32/msvc2008/Scribus-build-props.vsprops
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2008/Scribus-build-props.vsprops
(original)
+++ branches/Version14x/Scribus/win32/msvc2008/Scribus-build-props.vsprops
Sun Nov 8 19:34:37 2020
@@ -104,7 +104,7 @@
/>
<!-- Python -->
<UserMacro Name="PYTHON_DIR"
- Value="F:\Scribus Libs\scribus-common-libs\python-2.7.15-win32"
+ Value="F:\Scribus Libs\scribus-common-libs\python-2.7.18-win32"
/>
<UserMacro Name="PYTHON_DEBUG_LIB"
Value="python27_d.lib"
Modified: branches/Version14x/Scribus/win32/msvc2012/Scribus-build-props.props
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24214&path=/branches/Version14x/Scribus/win32/msvc2012/Scribus-build-props.props
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2012/Scribus-build-props.props
(original)
+++ branches/Version14x/Scribus/win32/msvc2012/Scribus-build-props.props
Sun Nov 8 19:34:37 2020
@@ -12,7 +12,8 @@
<!-- Import Qt4 -->
<PropertyGroup Label="UserMacros">
<!-- Qt4 -->
- <QT4_DIR Condition="'$(Platform)' ==
'Win32'">F:\Libraries-vcall\Qt-4.8.7\msvc2012</QT4_DIR>
+ <QT4_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)'
== 'v110'" >F:\Libraries-vcall\Qt-4.8.7\msvc2012</QT4_DIR>
+ <QT4_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)'
== 'v110_xp'">F:\Libraries-vcall\Qt-4.8.7\msvc2012_xp</QT4_DIR>
<QT4_DIR Condition="'$(Platform)' ==
'x64'">F:\Libraries-vcall\Qt-4.8.7\msvc2012_64</QT4_DIR>
<QT4_LIBS Condition="'$(Configuration)' ==
'Debug-cairo'">QtCored4.lib;QtGuid4.lib;QtNetworkd4.lib;QtXmld4.lib</QT4_LIBS>
<QT4_LIBS Condition="'$(Configuration)' ==
'Release-cairo'">QtCore4.lib;QtGui4.lib;QtNetwork4.lib;QtXml4.lib</QT4_LIBS>
Modified: branches/Version14x/Scribus/win32/msvc2013/Scribus-build-props.props
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24214&path=/branches/Version14x/Scribus/win32/msvc2013/Scribus-build-props.props
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2013/Scribus-build-props.props
(original)
+++ branches/Version14x/Scribus/win32/msvc2013/Scribus-build-props.props
Sun Nov 8 19:34:37 2020
@@ -12,7 +12,8 @@
<!-- Import Qt4 -->
<PropertyGroup Label="UserMacros">
<!-- Qt4 -->
- <QT4_DIR Condition="'$(Platform)' ==
'Win32'">F:\Libraries-vcall\Qt-4.8.7\msvc2013</QT4_DIR>
+ <QT4_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)'
== 'v120'" >F:\Libraries-vcall\Qt-4.8.7\msvc2013</QT4_DIR>
+ <QT4_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)'
== 'v120_xp'">F:\Libraries-vcall\Qt-4.8.7\msvc2013_xp</QT4_DIR>
<QT4_DIR Condition="'$(Platform)' ==
'x64'">F:\Libraries-vcall\Qt-4.8.7\msvc2013_64</QT4_DIR>
<QT4_LIBS Condition="'$(Configuration)' ==
'Debug-cairo'">QtCored4.lib;QtGuid4.lib;QtNetworkd4.lib;QtXmld4.lib</QT4_LIBS>
<QT4_LIBS Condition="'$(Configuration)' ==
'Release-cairo'">QtCore4.lib;QtGui4.lib;QtNetwork4.lib;QtXml4.lib</QT4_LIBS>
Modified: branches/Version14x/Scribus/win32/msvc2015/Scribus-build-props.props
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24214&path=/branches/Version14x/Scribus/win32/msvc2015/Scribus-build-props.props
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2015/Scribus-build-props.props
(original)
+++ branches/Version14x/Scribus/win32/msvc2015/Scribus-build-props.props
Sun Nov 8 19:34:37 2020
@@ -12,7 +12,8 @@
<!-- Import Qt4 -->
<PropertyGroup Label="UserMacros">
<!-- Qt4 -->
- <QT4_DIR Condition="'$(Platform)' ==
'Win32'">F:\Libraries-vcall\Qt-4.8.7\msvc2015</QT4_DIR>
+ <QT4_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)'
== 'v140'" >F:\Libraries-vcall\Qt-4.8.7\msvc2015</QT4_DIR>
+ <QT4_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)'
== 'v140_xp'">F:\Libraries-vcall\Qt-4.8.7\msvc2015_xp</QT4_DIR>
<QT4_DIR Condition="'$(Platform)' ==
'x64'">F:\Libraries-vcall\Qt-4.8.7\msvc2015_64</QT4_DIR>
<QT4_LIBS Condition="'$(Configuration)' ==
'Debug-cairo'">QtCored4.lib;QtGuid4.lib;QtNetworkd4.lib;QtXmld4.lib</QT4_LIBS>
<QT4_LIBS Condition="'$(Configuration)' ==
'Release-cairo'">QtCore4.lib;QtGui4.lib;QtNetwork4.lib;QtXml4.lib</QT4_LIBS>
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
