Skip to content

Commit

Permalink
Trying to make automated 64-bit Windows builds compatible with Window…
Browse files Browse the repository at this point in the history
…s XP again. (#83)
  • Loading branch information
c-lipka authored Aug 30, 2016
1 parent 46c9ecb commit 8afb143
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 25 deletions.
7 changes: 3 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ environment:
platform: Win32
bin_dir: bin32
artifact_suffix: -Win32
PlatformToolset: v100
PlatformToolset: v140_xp
- configuration: Release-SSE2
platform: Win32
bin_dir: bin32
artifact_suffix: -Win32-sse2
PlatformToolset: v100
PlatformToolset: v140_xp
- configuration: Release
platform: x64
bin_dir: bin64
artifact_suffix: -Win64
PlatformToolset: v140
PlatformToolset: v140_xp

before_build:
- ps: |
Expand Down Expand Up @@ -91,7 +91,6 @@ deploy:
tag: $(pov_tag_version)
release: $(pov_build_title) $(pov_build_version)
description: $(pov_build_message)

auth_token:
secure: WkcFPXyr/SJ9TXixTQyivhfoR9FzlryIbc4deHeQ0eA6YRXL0wQopMYJ6XL1/FJK
draft: true
Expand Down
2 changes: 1 addition & 1 deletion source/base/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#define OFFICIAL_VERSION_STRING "3.7.1"
#define OFFICIAL_VERSION_NUMBER 371

#define POV_RAY_PRERELEASE "alpha.8755786"
#define POV_RAY_PRERELEASE "alpha.8764097"

#if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
#ifdef POV_RAY_PRERELEASE
Expand Down
2 changes: 1 addition & 1 deletion unix/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.1-alpha.8755786
3.7.1-alpha.8764097
20 changes: 10 additions & 10 deletions windows/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="Header">
<p>
Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.<br>
Copyright 1991-2013 Persistence of Vision Raytracer Pty. Ltd.
Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
</p>

<p>
Expand All @@ -46,15 +46,6 @@
along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>
</p>
</div>
<br>
<div class="Header">
<pre><code>$File: //depot/public/povray/3.x/windows/readme.html $
$Revision: #1 $
$Change: 6069 $
$DateTime: 2013/11/06 11:59:40 $
$Author: chrisc $
</code></pre>
</div>

<div class="Main">

Expand Down Expand Up @@ -105,6 +96,15 @@ <h3>Visual Studio 2015</h3>
Community edition.
</p>

<p>
<b>Note:</b> By default, binaries generated by Visual Studio 2015 will be
incompatible with Windows XP. If you need XP support, you will have to change
the platform toolset from <code>v140</code> to <code>v140_xp</code>, either by
manually editing all project settings or by running the build from the command
prompt with the environment variable <code>PlatformToolset</code> set to
<code>v140_xp</code>.
</p>

<h3>Earlier Versions of Visual Studio</h3>

<p>
Expand Down
16 changes: 7 additions & 9 deletions windows/readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
------------------------------------------------------------------------

Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
Copyright 1991-2013 Persistence of Vision Raytracer Pty. Ltd.
Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.

POV-Ray is free software: you can redistribute it and/or modify it under
the terms of the GNU Affero General Public License as published by the
Expand All @@ -18,14 +18,6 @@ along with this program. If not, see http://www.gnu.org/licenses/

------------------------------------------------------------------------

$File: //depot/public/povray/3.x/windows/readme.txt $
$Revision: #1 $
$Change: 6069 $
$DateTime: 2013/11/06 11:59:40 $
$Author: chrisc $

------------------------------------------------------------------------

=======================================
Building the POV-Ray for Windows source
=======================================
Expand Down Expand Up @@ -72,6 +64,12 @@ The Visual Studio 2010 projects should also build fine in Visual Studio 2015
after automatic conversion, as has been tested with the Visual Studio 2015
Community edition.

*Note:* By default, binaries generated by Visual Studio 2015 will be
incompatible with Windows XP. If you need XP support you will have to change
the platform toolset from |v140| to |v140_xp|, either by manually editing all
project settings or by running the build from the command prompt with the
environment variable |PlatformToolset| set to |v140_xp|.

Earlier Versions of Visual Studio
---------------------------------

Expand Down

0 comments on commit 8afb143

Please sign in to comment.