aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-21 12:32:03 +0200
committermarha <marha@users.sourceforge.net>2013-06-21 12:32:03 +0200
commit979acee3986b3f5f3989fdacb52297ae425e17b8 (patch)
tree667a1a9351d599b30ed02137b17a16d2ed06ba7f
parent039fb6c83783fff3b92f1e7934ce4702cedb1722 (diff)
downloadvcxsrv-979acee3986b3f5f3989fdacb52297ae425e17b8.tar.gz
vcxsrv-979acee3986b3f5f3989fdacb52297ae425e17b8.tar.bz2
vcxsrv-979acee3986b3f5f3989fdacb52297ae425e17b8.zip
Solved freetype compilation problems
-rw-r--r--freetype/.gitignore1
-rwxr-xr-x[-rw-r--r--]freetype/freetype.vcxproj20
-rw-r--r--freetype/include/freetype/config/ftconfig.h4
-rw-r--r--freetype/include/freetype/fterrors.h4
-rw-r--r--freetype/include/freetype/fttypes.h6
-rw-r--r--freetype/include/freetype/internal/ftdebug.h4
-rw-r--r--freetype/src/autofit/aferrors.h4
7 files changed, 23 insertions, 20 deletions
diff --git a/freetype/.gitignore b/freetype/.gitignore
index c0d0e605d..2647b8950 100644
--- a/freetype/.gitignore
+++ b/freetype/.gitignore
@@ -1 +1,2 @@
ipch
+*.opensdf
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index 1ec353da4..17d98b1bb 100644..100755
--- a/freetype/freetype.vcxproj
+++ b/freetype/freetype.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Multithreaded|Win32">
@@ -73,10 +73,10 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">objs/debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">objs/debug_mt\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype2411MT_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype2411MT</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype2411_D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype2411</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype2501MT_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype2501MT</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype2501_D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype2501</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -112,7 +112,7 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\freetype\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;FT_FLAT_COMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;FT_FLAT_COMPILE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -170,7 +170,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\freetype\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;FT_FLAT_COMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;FT_FLAT_COMPILE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -197,7 +197,9 @@
<ClCompile Include="src\autofit\afangles.c" />
<ClCompile Include="src\autofit\afcjk.c" />
<ClCompile Include="src\autofit\afdummy.c" />
- <ClCompile Include="src\autofit\afglobal.c" />
+ <ClCompile Include="src\autofit\afglobal.c">
+ <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">false</PreprocessToFile>
+ </ClCompile>
<ClCompile Include="src\autofit\afhints.c" />
<ClCompile Include="src\autofit\afindic.c" />
<ClCompile Include="src\autofit\aflatin.c" />
@@ -384,4 +386,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/freetype/include/freetype/config/ftconfig.h b/freetype/include/freetype/config/ftconfig.h
index 5dce30ef3..f7665efab 100644
--- a/freetype/include/freetype/config/ftconfig.h
+++ b/freetype/include/freetype/config/ftconfig.h
@@ -39,8 +39,8 @@
#define __FTCONFIG_H__
#include <ft2build.h>
-#include FT_CONFIG_OPTIONS_H
-#include FT_CONFIG_STANDARD_LIBRARY_H
+#include <freetype/config/ftoption.h>
+#include <freetype/config/ftstdlib.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/freetype/fterrors.h b/freetype/include/freetype/fterrors.h
index 0fa3e4dce..dfde72027 100644
--- a/freetype/include/freetype/fterrors.h
+++ b/freetype/include/freetype/fterrors.h
@@ -86,7 +86,7 @@
/* include module base error codes */
-#include FT_MODULE_ERRORS_H
+#include <freetype/ftmoderr.h>
/*******************************************************************/
@@ -157,7 +157,7 @@
/* now include the error codes */
-#include FT_ERROR_DEFINITIONS_H
+#include <freetype/fterrdef.h>
#ifdef FT_ERROR_END_LIST
diff --git a/freetype/include/freetype/fttypes.h b/freetype/include/freetype/fttypes.h
index 027e59ce1..5781be012 100644
--- a/freetype/include/freetype/fttypes.h
+++ b/freetype/include/freetype/fttypes.h
@@ -21,9 +21,9 @@
#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_SYSTEM_H
-#include FT_IMAGE_H
+#include <freetype/config/ftconfig.h>
+#include <freetype/ftsystem.h>
+#include <freetype/ftimage.h>
#include <stddef.h>
diff --git a/freetype/include/freetype/internal/ftdebug.h b/freetype/include/freetype/internal/ftdebug.h
index 7d72f9301..cda7151fe 100644
--- a/freetype/include/freetype/internal/ftdebug.h
+++ b/freetype/include/freetype/internal/ftdebug.h
@@ -26,7 +26,7 @@
#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
+#include <freetype/config/ftconfig.h>
#include <freetype/freetype.h>
@@ -56,7 +56,7 @@ FT_BEGIN_HEADER
/* defining the enumeration */
typedef enum FT_Trace_
{
-#include FT_INTERNAL_TRACE_H
+#include <freetype/internal/fttrace.h>
trace_count
} FT_Trace;
diff --git a/freetype/src/autofit/aferrors.h b/freetype/src/autofit/aferrors.h
index 50e1a22dd..824d0b3a3 100644
--- a/freetype/src/autofit/aferrors.h
+++ b/freetype/src/autofit/aferrors.h
@@ -26,7 +26,7 @@
#ifndef __AFERRORS_H__
#define __AFERRORS_H__
-#include FT_MODULE_ERRORS_H
+#include <freetype/ftmoderr.h>
#undef __FTERRORS_H__
@@ -34,7 +34,7 @@
#define FT_ERR_PREFIX AF_Err_
#define FT_ERR_BASE FT_Mod_Err_Autofit
-#include FT_ERRORS_H
+#include <freetype/fterrors.h>
#endif /* __AFERRORS_H__ */