summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2018-05-26 16:13:12 +0200
committerMichael Lutz <michi@icosahedron.de>2018-06-06 21:37:09 +0200
commit768a31bfe3bc8da1482e0c7115bc46bf90b1e7ec (patch)
treebf5534df4faf1a9d48edbf355b8e7c1fa2ef2cb9 /projects
parenta4278c302b7721d22e4501315b5a1713f5471163 (diff)
downloadopenttd-768a31bfe3bc8da1482e0c7115bc46bf90b1e7ec.tar.xz
Add: [Win32] Text layout using the native Windows Uniscribe library.
Uniscribe is sometimes producing different results compared to ICU, especially when RTL and LTR content is mixed. Comparing the results to other programs (like editors or web browsers) leads me to believe that the result are at least not worse than ICU and possibly better.
Diffstat (limited to 'projects')
-rw-r--r--projects/openttd_vs100.vcxproj2
-rw-r--r--projects/openttd_vs100.vcxproj.filters6
-rw-r--r--projects/openttd_vs140.vcxproj2
-rw-r--r--projects/openttd_vs140.vcxproj.filters6
-rw-r--r--projects/openttd_vs141.vcxproj2
-rw-r--r--projects/openttd_vs141.vcxproj.filters6
-rw-r--r--projects/openttd_vs80.vcproj8
-rw-r--r--projects/openttd_vs90.vcproj8
8 files changed, 40 insertions, 0 deletions
diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index 176b15d82..7029a36b0 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -631,6 +631,7 @@
<ClInclude Include="..\src\string_base.h" />
<ClInclude Include="..\src\string_func.h" />
<ClInclude Include="..\src\string_type.h" />
+ <ClInclude Include="..\src\os\windows\string_uniscribe.h" />
<ClInclude Include="..\src\stringfilter_type.h" />
<ClInclude Include="..\src\strings_func.h" />
<ClInclude Include="..\src\strings_type.h" />
@@ -1303,6 +1304,7 @@
<ClCompile Include="..\src\sound\xaudio2_s.cpp" />
<ClCompile Include="..\src\os\windows\crashlog_win.cpp" />
<ResourceCompile Include="..\src\os\windows\ottdres.rc" />
+ <ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index 3349f9954..7f529a397 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -1050,6 +1050,9 @@
<ClInclude Include="..\src\string_type.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\src\os\windows\string_uniscribe.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="..\src\stringfilter_type.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -3066,6 +3069,9 @@
<ResourceCompile Include="..\src\os\windows\ottdres.rc">
<Filter>Windows files</Filter>
</ResourceCompile>
+ <ClCompile Include="..\src\os\windows\string_uniscribe.cpp">
+ <Filter>Windows files</Filter>
+ </ClCompile>
<ClCompile Include="..\src\os\windows\win32.cpp">
<Filter>Windows files</Filter>
</ClCompile>
diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj
index fa35e17d8..aadd69b47 100644
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -652,6 +652,7 @@
<ClInclude Include="..\src\string_base.h" />
<ClInclude Include="..\src\string_func.h" />
<ClInclude Include="..\src\string_type.h" />
+ <ClInclude Include="..\src\os\windows\string_uniscribe.h" />
<ClInclude Include="..\src\stringfilter_type.h" />
<ClInclude Include="..\src\strings_func.h" />
<ClInclude Include="..\src\strings_type.h" />
@@ -1324,6 +1325,7 @@
<ClCompile Include="..\src\sound\xaudio2_s.cpp" />
<ClCompile Include="..\src\os\windows\crashlog_win.cpp" />
<ResourceCompile Include="..\src\os\windows\ottdres.rc" />
+ <ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
diff --git a/projects/openttd_vs140.vcxproj.filters b/projects/openttd_vs140.vcxproj.filters
index 3349f9954..7f529a397 100644
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -1050,6 +1050,9 @@
<ClInclude Include="..\src\string_type.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\src\os\windows\string_uniscribe.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="..\src\stringfilter_type.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -3066,6 +3069,9 @@
<ResourceCompile Include="..\src\os\windows\ottdres.rc">
<Filter>Windows files</Filter>
</ResourceCompile>
+ <ClCompile Include="..\src\os\windows\string_uniscribe.cpp">
+ <Filter>Windows files</Filter>
+ </ClCompile>
<ClCompile Include="..\src\os\windows\win32.cpp">
<Filter>Windows files</Filter>
</ClCompile>
diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
index daf92ee98..8ac7b3a6b 100644
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -652,6 +652,7 @@
<ClInclude Include="..\src\string_base.h" />
<ClInclude Include="..\src\string_func.h" />
<ClInclude Include="..\src\string_type.h" />
+ <ClInclude Include="..\src\os\windows\string_uniscribe.h" />
<ClInclude Include="..\src\stringfilter_type.h" />
<ClInclude Include="..\src\strings_func.h" />
<ClInclude Include="..\src\strings_type.h" />
@@ -1324,6 +1325,7 @@
<ClCompile Include="..\src\sound\xaudio2_s.cpp" />
<ClCompile Include="..\src\os\windows\crashlog_win.cpp" />
<ResourceCompile Include="..\src\os\windows\ottdres.rc" />
+ <ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
diff --git a/projects/openttd_vs141.vcxproj.filters b/projects/openttd_vs141.vcxproj.filters
index 3349f9954..7f529a397 100644
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -1050,6 +1050,9 @@
<ClInclude Include="..\src\string_type.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\src\os\windows\string_uniscribe.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="..\src\stringfilter_type.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -3066,6 +3069,9 @@
<ResourceCompile Include="..\src\os\windows\ottdres.rc">
<Filter>Windows files</Filter>
</ResourceCompile>
+ <ClCompile Include="..\src\os\windows\string_uniscribe.cpp">
+ <Filter>Windows files</Filter>
+ </ClCompile>
<ClCompile Include="..\src\os\windows\win32.cpp">
<Filter>Windows files</Filter>
</ClCompile>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index b2c0a13bb..17027404d 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1711,6 +1711,10 @@
>
</File>
<File
+ RelativePath=".\..\src\os\windows\string_uniscribe.h"
+ >
+ </File>
+ <File
RelativePath=".\..\src\stringfilter_type.h"
>
</File>
@@ -4519,6 +4523,10 @@
>
</File>
<File
+ RelativePath=".\..\src\os\windows\string_uniscribe.cpp"
+ >
+ </File>
+ <File
RelativePath=".\..\src\os\windows\win32.cpp"
>
</File>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 33fad8573..fad9d09ee 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1708,6 +1708,10 @@
>
</File>
<File
+ RelativePath=".\..\src\os\windows\string_uniscribe.h"
+ >
+ </File>
+ <File
RelativePath=".\..\src\stringfilter_type.h"
>
</File>
@@ -4516,6 +4520,10 @@
>
</File>
<File
+ RelativePath=".\..\src\os\windows\string_uniscribe.cpp"
+ >
+ </File>
+ <File
RelativePath=".\..\src\os\windows\win32.cpp"
>
</File>