Commit fd8000f0402d48fd22f774170c74d585a82d7508
2018-01-18T03:58:34
[build] Move VERSIONINFO resource. * builds/windows/vc2010/freetype.vcxproj: Updated. * builds/windows/ftver.rc: Move file from here... * src/base/ftver.rc: ... to here.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
diff --git a/ChangeLog b/ChangeLog
index 6e1a0f3..0f03431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-18 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [build] Move VERSIONINFO resource.
+
+ * builds/windows/vc2010/freetype.vcxproj: Updated.
+ * builds/windows/ftver.rc: Move file from here...
+ * src/base/ftver.rc: ... to here.
+
2018-01-12 Alexei Podtelezhnikov <apodtele@gmail.com>
[build] Expand dllexport/dllimport to Cygwin/MinGW.
diff --git a/builds/windows/ftver.rc b/builds/windows/ftver.rc
deleted file mode 100644
index 1093109..0000000
--- a/builds/windows/ftver.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#include<Windows.h>
-
-#define FT_VERSION 2,9,0,0
-#define FT_VERSION_STR "2.9.0"
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION FT_VERSION
-PRODUCTVERSION FT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#endif
-#ifdef _DLL
-FILETYPE VFT_DLL
-#define FT_FILENAME "freetype.dll"
-#else
-FILETYPE VFT_STATIC_LIB
-#define FT_FILENAME "freetype.lib"
-#endif
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4"
- BEGIN
- VALUE "CompanyName", "The FreeType Project"
- VALUE "FileDescription", "Font Rendering Library"
- VALUE "FileVersion", FT_VERSION_STR
- VALUE "ProductName", "FreeType"
- VALUE "ProductVersion", FT_VERSION_STR
- VALUE "LegalCopyright", "© 2017 The FreeType Project www.freetype.org. All rights reserved."
- VALUE "InternalName", "freetype"
- VALUE "OriginalFilename", FT_FILENAME
- END
- END
-
- BLOCK "VarFileInfo"
- BEGIN
- /* The following line should only be modified for localized versions. */
- /* It consists of any number of WORD,WORD pairs, with each pair */
- /* describing a "language,codepage" combination supported by the file. */
- VALUE "Translation", 0x409, 1252
- END
-END
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index 8eb5b9a..eaddcfd 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -435,7 +435,7 @@
<ClCompile Include="..\ftdebug.c">
<DisableLanguageExtensions>false</DisableLanguageExtensions>
</ClCompile>
- <ResourceCompile Include="..\ftver.rc" />
+ <ResourceCompile Include="..\..\..\src\base\ftver.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/src/base/ftver.rc b/src/base/ftver.rc
new file mode 100644
index 0000000..1093109
--- /dev/null
+++ b/src/base/ftver.rc
@@ -0,0 +1,43 @@
+#include<Windows.h>
+
+#define FT_VERSION 2,9,0,0
+#define FT_VERSION_STR "2.9.0"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION FT_VERSION
+PRODUCTVERSION FT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#endif
+#ifdef _DLL
+FILETYPE VFT_DLL
+#define FT_FILENAME "freetype.dll"
+#else
+FILETYPE VFT_STATIC_LIB
+#define FT_FILENAME "freetype.lib"
+#endif
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "The FreeType Project"
+ VALUE "FileDescription", "Font Rendering Library"
+ VALUE "FileVersion", FT_VERSION_STR
+ VALUE "ProductName", "FreeType"
+ VALUE "ProductVersion", FT_VERSION_STR
+ VALUE "LegalCopyright", "© 2017 The FreeType Project www.freetype.org. All rights reserved."
+ VALUE "InternalName", "freetype"
+ VALUE "OriginalFilename", FT_FILENAME
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN
+ /* The following line should only be modified for localized versions. */
+ /* It consists of any number of WORD,WORD pairs, with each pair */
+ /* describing a "language,codepage" combination supported by the file. */
+ VALUE "Translation", 0x409, 1252
+ END
+END