This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Use VS 2015

  • Loading branch information...
Arnavion committed Oct 8, 2015
1 parent f859838 commit 2f3c96d1bda318a9cdf2a85d80e9a838c5b850ae
Showing with 13 additions and 6 deletions.
  1. +3 −3 README.md
  2. +9 −1 build.ps1
  3. +1 −1 enchant/src/config.h
  4. +0 −1 fontconfig/config.h
View
@@ -1,4 +1,4 @@
Here you can download a GTK+ 2 bundle (and a few additional libraries) built with Visual Studio 2013. HexChat for Windows is built using this bundle.
Here you can download a GTK+ 2 bundle (and a few additional libraries) built with Visual Studio 2015. HexChat for Windows is built using this bundle.
## GTK+ Bundle
@@ -12,7 +12,7 @@ This is the bundle built by us containing all the GTK+ binaries, headers and imp
<td><a href="https://dl.hexchat.net/gtk-win32/vc12/x64/gtk-x64.7z">64-bit</a></td>
</tr>
<tr>
<td><a href="https://www.microsoft.com/en-us/download/details.aspx?id=40784">Microsoft Visual C++ Redistributable Package for Visual Studio 2013</a></td>
<td><a href="https://www.microsoft.com/en-us/download/details.aspx?id=48145">Microsoft Visual C++ Redistributable Package for Visual Studio 2015</a></td>
<td>vcredist_x86.exe - 32-bit</a></td>
<td>vcredist_x64.exe - 64-bit</a></td>
</tr>
@@ -120,7 +120,7 @@ If you want to build the bundle from source yourself, we have a PowerShell scrip
1. Install the following build tools and dependencies:
* [Visual Studio 2013 Express for Windows Desktop](http://www.visualstudio.com/downloads/download-visual-studio-vs#d-2013-express) - Any version of VS apart from 2013 is not supported.
* [Visual Studio 2015 Community](http://www.visualstudio.com/downloads/download-visual-studio-vs) - Any version of VS apart from 2015 is not supported.
* [Windows Management Framework 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=40855) - Not needed for Windows 8.1 and above
* [CMake 3.0.2](http://www.cmake.org/download/)
* [msys2](https://msys2.github.io/)
View
@@ -107,7 +107,7 @@ param (
$PatchesRootDirectory = "$BuildDirectory\github\gtk-win32",
[string]
$VSInstallPath = 'C:\Program Files (x86)\Microsoft Visual Studio 12.0',
$VSInstallPath = 'C:\Program Files (x86)\Microsoft Visual Studio 14.0',
[string]
$CMakePath = 'C:\Program Files (x86)\CMake\bin',
@@ -1049,6 +1049,14 @@ $items.GetEnumerator() | %{
Copy-Item "$($item.PatchDirectory)\*" $item.BuildDirectory -Recurse -Force
"Copied patch contents from $($item.PatchDirectory) to $($item.BuildDirectory)"
Push-Location $item.BuildDirectory
Get-ChildItem -Recurse *.vcxproj | %{
$contents = Get-Content $_.FullName
$contents = $contents -replace '<PlatformToolset>v120</PlatformToolset>', '<PlatformToolset>v140</PlatformToolset>' -replace '<GenerateDebugInformation>true</GenerateDebugInformation>', '<GenerateDebugInformation>Debug</GenerateDebugInformation>'
$contents | Out-File -LiteralPath $_.FullName -Encoding utf8
}
Pop-Location
})
}
View
@@ -7,7 +7,7 @@
#ifdef _WIN64
typedef __int64 ssize_t;
#else
typedef _W64 int ssize_t;
typedef int ssize_t;
#endif
#define SSIZE_T_DEFINED
#endif
View
@@ -32,7 +32,6 @@
# define W_OK 0x02
#endif
#define snprintf _snprintf
/* Font configuration directory */
#define CONFDIR "c:/windows/etc"

0 comments on commit 2f3c96d

Please sign in to comment.