diff options
author | Werner Lemberg <wl@gnu.org> | 2015-06-22 06:35:23 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2015-06-22 06:35:23 +0200 |
commit | 8502c98b15390a397de2d5826c9d8b017d7fc208 (patch) | |
tree | 90d3ab5eaa2a7337e6782a0c3795ad0d4aea90e7 /builds/windows | |
parent | 31d97df99fb8c7f52d19d675b8d497753f719594 (diff) | |
download | freetype2-8502c98b15390a397de2d5826c9d8b017d7fc208.tar.gz |
Fix Savannah bug #45097.
We no longer `pollute' the namespace of possible header file names;
instead we move `ft2build.h' up by one level so that it gets
installed in the default include directory (e.g.,
/usr/local/include). After this commit, only `ft2build.h' stays in
the compiler's include path.
No visible changes for the user who follows the standard FreeType
header inclusion rules.
* include/*: Move to ...
* include/freetype2/*: This directory, except `ft2build.h'.
* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
PRIVATE_HEADERS), Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated.
* builds/amiga/include/config/ftconfig.h, builds/freetype.mk
(PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work),
builds/unix/install.mk (install, uninstall),
builds/unix/freetype2.in: Updated.
* builds/unix/freetype-config.in: Updated.
Emit -I directory only if it is not `/usr/include'.
* builds/wince/*, builds/windows/*: Updated.
* devel/ft2build.h, include/ft2build.h: Updated.
* include/freetype2/config/ftheader.h,
include/freetype2/internal/ftserv.h,
include/freetype2/internal/internal.h: Update all header file
macros.
* src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated.
* docs/*: Updated.
Diffstat (limited to 'builds/windows')
-rw-r--r-- | builds/windows/vc2005/freetype.vcproj | 10 | ||||
-rw-r--r-- | builds/windows/vc2008/freetype.vcproj | 10 | ||||
-rw-r--r-- | builds/windows/vc2010/freetype.vcxproj | 10 | ||||
-rw-r--r-- | builds/windows/vc2010/freetype.vcxproj.filters | 10 | ||||
-rw-r--r-- | builds/windows/visualc/freetype.dsp | 10 | ||||
-rw-r--r-- | builds/windows/visualc/freetype.vcproj | 10 | ||||
-rw-r--r-- | builds/windows/visualce/freetype.dsp | 10 | ||||
-rw-r--r-- | builds/windows/visualce/freetype.vcproj | 10 |
8 files changed, 40 insertions, 40 deletions
diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj index eb52ab556..6cd6cffdc 100644 --- a/builds/windows/vc2005/freetype.vcproj +++ b/builds/windows/vc2005/freetype.vcproj @@ -629,15 +629,15 @@ <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
<File RelativePath="..\..\..\include\ft2build.h">
</File>
- <File RelativePath="..\..\..\include\config\ftconfig.h">
+ <File RelativePath="..\..\..\include\freetype2\config\ftconfig.h">
</File>
- <File RelativePath="..\..\..\include\config\ftheader.h">
+ <File RelativePath="..\..\..\include\freetype2\config\ftheader.h">
</File>
- <File RelativePath="..\..\..\include\config\ftmodule.h">
+ <File RelativePath="..\..\..\include\freetype2\config\ftmodule.h">
</File>
- <File RelativePath="..\..\..\include\config\ftoption.h">
+ <File RelativePath="..\..\..\include\freetype2\config\ftoption.h">
</File>
- <File RelativePath="..\..\..\include\config\ftstdlib.h">
+ <File RelativePath="..\..\..\include\freetype2\config\ftstdlib.h">
</File>
</Filter>
</Files>
diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj index 738fe7ccf..15dce3dfd 100644 --- a/builds/windows/vc2008/freetype.vcproj +++ b/builds/windows/vc2008/freetype.vcproj @@ -2154,23 +2154,23 @@ >
</File>
<File
- RelativePath="..\..\..\include\config\ftconfig.h"
+ RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftheader.h"
+ RelativePath="..\..\..\include\freetype2\config\ftheader.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftmodule.h"
+ RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftoption.h"
+ RelativePath="..\..\..\include\freetype2\config\ftoption.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftstdlib.h"
+ RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
>
</File>
</Filter>
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 3fa8cd2d0..5fef864b6 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -1706,11 +1706,11 @@ </ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\include\ft2build.h" />
- <ClInclude Include="..\..\..\include\config\ftconfig.h" />
- <ClInclude Include="..\..\..\include\config\ftheader.h" />
- <ClInclude Include="..\..\..\include\config\ftmodule.h" />
- <ClInclude Include="..\..\..\include\config\ftoption.h" />
- <ClInclude Include="..\..\..\include\config\ftstdlib.h" />
+ <ClInclude Include="..\..\..\include\freetype2\config\ftconfig.h" />
+ <ClInclude Include="..\..\..\include\freetype2\config\ftheader.h" />
+ <ClInclude Include="..\..\..\include\freetype2\config\ftmodule.h" />
+ <ClInclude Include="..\..\..\include\freetype2\config\ftoption.h" />
+ <ClInclude Include="..\..\..\include\freetype2\config\ftstdlib.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/builds/windows/vc2010/freetype.vcxproj.filters b/builds/windows/vc2010/freetype.vcxproj.filters index f762b0b54..9b7c0615c 100644 --- a/builds/windows/vc2010/freetype.vcxproj.filters +++ b/builds/windows/vc2010/freetype.vcxproj.filters @@ -136,19 +136,19 @@ <ClInclude Include="..\..\..\include\ft2build.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\config\ftconfig.h">
+ <ClInclude Include="..\..\..\include\freetype2\config\ftconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\config\ftheader.h">
+ <ClInclude Include="..\..\..\include\freetype2\config\ftheader.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\config\ftmodule.h">
+ <ClInclude Include="..\..\..\include\freetype2\config\ftmodule.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\config\ftoption.h">
+ <ClInclude Include="..\..\..\include\freetype2\config\ftoption.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\config\ftstdlib.h">
+ <ClInclude Include="..\..\..\include\freetype2\config\ftstdlib.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 6f0310538..f41296549 100644 --- a/builds/windows/visualc/freetype.dsp +++ b/builds/windows/visualc/freetype.dsp @@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h # End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftconfig.h
+SOURCE=..\..\..\include\freetype2\config\ftconfig.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftheader.h
+SOURCE=..\..\..\include\freetype2\config\ftheader.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftmodule.h
+SOURCE=..\..\..\include\freetype2\config\ftmodule.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftoption.h
+SOURCE=..\..\..\include\freetype2\config\ftoption.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftstdlib.h
+SOURCE=..\..\..\include\freetype2\config\ftstdlib.h
# End Source File
# End Group
# End Target
diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index f43496494..d5baa4b6d 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -2153,23 +2153,23 @@ >
</File>
<File
- RelativePath="..\..\..\include\config\ftconfig.h"
+ RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftheader.h"
+ RelativePath="..\..\..\include\freetype2\config\ftheader.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftmodule.h"
+ RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftoption.h"
+ RelativePath="..\..\..\include\freetype2\config\ftoption.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftstdlib.h"
+ RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
>
</File>
</Filter>
diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index 6f0310538..f41296549 100644 --- a/builds/windows/visualce/freetype.dsp +++ b/builds/windows/visualce/freetype.dsp @@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h # End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftconfig.h
+SOURCE=..\..\..\include\freetype2\config\ftconfig.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftheader.h
+SOURCE=..\..\..\include\freetype2\config\ftheader.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftmodule.h
+SOURCE=..\..\..\include\freetype2\config\ftmodule.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftoption.h
+SOURCE=..\..\..\include\freetype2\config\ftoption.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\include\config\ftstdlib.h
+SOURCE=..\..\..\include\freetype2\config\ftstdlib.h
# End Source File
# End Group
# End Target
diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index 69a9e97e8..dcd384b20 100644 --- a/builds/windows/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -13859,23 +13859,23 @@ >
</File>
<File
- RelativePath="..\..\..\include\config\ftconfig.h"
+ RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftheader.h"
+ RelativePath="..\..\..\include\freetype2\config\ftheader.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftmodule.h"
+ RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftoption.h"
+ RelativePath="..\..\..\include\freetype2\config\ftoption.h"
>
</File>
<File
- RelativePath="..\..\..\include\config\ftstdlib.h"
+ RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
>
</File>
</Filter>
|