summary refs log tree commit diff stats
path: root/win32/deps/fontconfig
diff options
context:
space:
mode:
Diffstat (limited to 'win32/deps/fontconfig')
-rw-r--r--win32/deps/fontconfig/fc-arch.vcxproj4
-rw-r--r--win32/deps/fontconfig/fc-cache.vcxproj4
-rw-r--r--win32/deps/fontconfig/fc-case.vcxproj4
-rw-r--r--win32/deps/fontconfig/fc-cat.vcxproj4
-rw-r--r--win32/deps/fontconfig/fc-glyphname.vcxproj4
-rw-r--r--win32/deps/fontconfig/fc-lang.vcxproj4
-rw-r--r--win32/deps/fontconfig/fc-list.vcxproj4
-rw-r--r--win32/deps/fontconfig/fc-match.vcxproj4
-rw-r--r--win32/deps/fontconfig/fontconfig.patch130
-rw-r--r--win32/deps/fontconfig/fontconfig.props1
-rw-r--r--win32/deps/fontconfig/fontconfig.sln1
-rw-r--r--win32/deps/fontconfig/unistd.h3
12 files changed, 164 insertions, 3 deletions
diff --git a/win32/deps/fontconfig/fc-arch.vcxproj b/win32/deps/fontconfig/fc-arch.vcxproj
index db3bd130..c9c0f620 100644
--- a/win32/deps/fontconfig/fc-arch.vcxproj
+++ b/win32/deps/fontconfig/fc-arch.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fc-cache.vcxproj b/win32/deps/fontconfig/fc-cache.vcxproj
index cd797845..ca5c32d5 100644
--- a/win32/deps/fontconfig/fc-cache.vcxproj
+++ b/win32/deps/fontconfig/fc-cache.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fc-case.vcxproj b/win32/deps/fontconfig/fc-case.vcxproj
index 9e0be5cb..9a3eec0b 100644
--- a/win32/deps/fontconfig/fc-case.vcxproj
+++ b/win32/deps/fontconfig/fc-case.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fc-cat.vcxproj b/win32/deps/fontconfig/fc-cat.vcxproj
index 3f437e14..a7cb1421 100644
--- a/win32/deps/fontconfig/fc-cat.vcxproj
+++ b/win32/deps/fontconfig/fc-cat.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fc-glyphname.vcxproj b/win32/deps/fontconfig/fc-glyphname.vcxproj
index 5eafd898..ffd28040 100644
--- a/win32/deps/fontconfig/fc-glyphname.vcxproj
+++ b/win32/deps/fontconfig/fc-glyphname.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fc-lang.vcxproj b/win32/deps/fontconfig/fc-lang.vcxproj
index 0ad15bdd..48cad5b5 100644
--- a/win32/deps/fontconfig/fc-lang.vcxproj
+++ b/win32/deps/fontconfig/fc-lang.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fc-list.vcxproj b/win32/deps/fontconfig/fc-list.vcxproj
index da649389..d67cb3f5 100644
--- a/win32/deps/fontconfig/fc-list.vcxproj
+++ b/win32/deps/fontconfig/fc-list.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fc-match.vcxproj b/win32/deps/fontconfig/fc-match.vcxproj
index ff88751b..563b97b8 100644
--- a/win32/deps/fontconfig/fc-match.vcxproj
+++ b/win32/deps/fontconfig/fc-match.vcxproj
@@ -49,15 +49,19 @@
   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="fontconfig.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

diff --git a/win32/deps/fontconfig/fontconfig.patch b/win32/deps/fontconfig/fontconfig.patch
new file mode 100644
index 00000000..b3a0880d
--- /dev/null
+++ b/win32/deps/fontconfig/fontconfig.patch
@@ -0,0 +1,130 @@
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-cache/fc-cache.c fontconfig-2.8.0/fc-cache/fc-cache.c
+--- fontconfig-2.8.0.orig/fc-cache/fc-cache.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-cache/fc-cache.c	2012-10-02 08:35:20 +0000
+@@ -36,7 +36,9 @@
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-cat/fc-cat.c fontconfig-2.8.0/fc-cat/fc-cat.c
+--- fontconfig-2.8.0.orig/fc-cat/fc-cat.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-cat/fc-cat.c	2012-10-02 08:35:37 +0000
+@@ -36,7 +36,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-list/fc-list.c fontconfig-2.8.0/fc-list/fc-list.c
+--- fontconfig-2.8.0.orig/fc-list/fc-list.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-list/fc-list.c	2012-10-02 08:35:52 +0000
+@@ -24,7 +24,9 @@
+ 
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef HAVE_CONFIG_H
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-match/fc-match.c fontconfig-2.8.0/fc-match/fc-match.c
+--- fontconfig-2.8.0.orig/fc-match/fc-match.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-match/fc-match.c	2012-10-02 08:36:04 +0000
+@@ -33,7 +33,9 @@
+ 
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-query/fc-query.c fontconfig-2.8.0/fc-query/fc-query.c
+--- fontconfig-2.8.0.orig/fc-query/fc-query.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-query/fc-query.c	2012-10-02 08:36:09 +0000
+@@ -36,7 +36,9 @@
+ #include <fontconfig/fontconfig.h>
+ #include <fontconfig/fcfreetype.h>
+ #include <stdio.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-scan/fc-scan.c fontconfig-2.8.0/fc-scan/fc-scan.c
+--- fontconfig-2.8.0.orig/fc-scan/fc-scan.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-scan/fc-scan.c	2012-10-02 08:36:21 +0000
+@@ -36,7 +36,9 @@
+ #include <fontconfig/fontconfig.h>
+ #include <fontconfig/fcfreetype.h>
+ #include <stdio.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fontconfig/fontconfig.h fontconfig-2.8.0/fontconfig/fontconfig.h
+--- fontconfig-2.8.0.orig/fontconfig/fontconfig.h	2009-11-18 23:49:23 +0000
++++ fontconfig-2.8.0/fontconfig/fontconfig.h	2012-10-02 08:36:37 +0000
+@@ -27,7 +27,9 @@
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <stdarg.h>
+ 
+ #if defined(__GNUC__) && (__GNUC__ >= 4)
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/src/fcatomic.c fontconfig-2.8.0/src/fcatomic.c
+--- fontconfig-2.8.0.orig/src/fcatomic.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/src/fcatomic.c	2012-10-02 08:36:59 +0000
+@@ -51,7 +51,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <stdlib.h>
+ #include <time.h>
+ 
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/src/fccache.c fontconfig-2.8.0/src/fccache.c
+--- fontconfig-2.8.0.orig/src/fccache.c	2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/src/fccache.c	2012-10-02 08:39:46 +0000
+@@ -30,7 +30,9 @@
+ #include <sys/types.h>
+ #include <assert.h>
+ #if defined(HAVE_MMAP) || defined(__CYGWIN__)
++#ifndef WIN32
+ #  include <unistd.h>
++#endif
+ #  include <sys/mman.h>
+ #elif defined(_WIN32)
+ #  define _WIN32_WINNT 0x0500
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/src/fcint.h fontconfig-2.8.0/src/fcint.h
+--- fontconfig-2.8.0.orig/src/fcint.h	2009-11-16 22:46:18 +0000
++++ fontconfig-2.8.0/src/fcint.h	2012-10-02 08:38:33 +0000
+@@ -41,7 +41,9 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
++#ifndef WIN32
+ #include <unistd.h>
++#endif
+ #include <stddef.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/win32/deps/fontconfig/fontconfig.props b/win32/deps/fontconfig/fontconfig.props
index a96aa703..9bad8bd8 100644
--- a/win32/deps/fontconfig/fontconfig.props
+++ b/win32/deps/fontconfig/fontconfig.props
@@ -6,6 +6,7 @@
 	<ItemDefinitionGroup>

 		<ClCompile>

 			<AdditionalIncludeDirectories>..\build\$(Platform)\include</AdditionalIncludeDirectories>

+			<PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

 		</ClCompile>

 		<Link>

 			<!--AdditionalDependencies></AdditionalDependencies-->

diff --git a/win32/deps/fontconfig/fontconfig.sln b/win32/deps/fontconfig/fontconfig.sln
index ca310b58..d1cbb668 100644
--- a/win32/deps/fontconfig/fontconfig.sln
+++ b/win32/deps/fontconfig/fontconfig.sln
@@ -1,3 +1,4 @@
+

 Microsoft Visual Studio Solution File, Format Version 12.00

 # Visual Studio Express 2012 for Windows Desktop

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig", "fontconfig.vcxproj", "{E82C60A1-5613-4DB5-B965-5F1E11CB68BD}"

diff --git a/win32/deps/fontconfig/unistd.h b/win32/deps/fontconfig/unistd.h
deleted file mode 100644
index 5cc18f4d..00000000
--- a/win32/deps/fontconfig/unistd.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* stub unistd.h for use for MSVC compilers */

-

-#include <io.h>
\ No newline at end of file
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-17 21:50:03 +0000