mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix RTL for Windows
This commit is contained in:
parent
fbfdcc2412
commit
c204767176
|
@ -62,6 +62,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>wininet.lib;imm32.lib;version.lib;winmm.lib;crypt32.lib;wldap32.lib;shlwapi.lib;setupapi.lib;bcrypt.lib;winhttp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies Condition="'$(Platform)'=='Win32' or '$(Platform)'=='x64'">libfribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalOptions>/OPT:NOLBR /ignore:4099 %(AdditionalOptions)</AdditionalOptions>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(OPENRCT2_SHA1_SHORT)'!=''">/D "OPENRCT2_COMMIT_SHA1_SHORT=\"$(OPENRCT2_SHA1_SHORT)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(OPENRCT2_DESCRIBE)'!=''">/D "OPENRCT2_VERSION_TAG=\"$(OPENRCT2_DESCRIBE)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(Configuration)'=='Release'">/D "USE_BREAKPAD" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(Platform)'=='Win32' || '$(Platform)'=='x64'">/D "USE_FRIBIDI" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
|
||||
<RootDir>$(MsBuildThisFileDirectory)</RootDir>
|
||||
<TargetDir>$(RootDir)bin\</TargetDir>
|
||||
|
|
|
@ -24,7 +24,7 @@ static constexpr const uint16_t BufferLength = 1024;
|
|||
std::string FixRTL(std::string& input)
|
||||
{
|
||||
FriBidiChar utf32String[BufferLength] = { 0 };
|
||||
FriBidiStrIndex len = input.length() + 1;
|
||||
auto len = static_cast<FriBidiStrIndex>(input.length() + 1);
|
||||
fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, input.c_str(), len, utf32String);
|
||||
|
||||
FriBidiStrIndex utf32len = 0;
|
|
@ -34,7 +34,7 @@
|
|||
<ClCompile>
|
||||
<PreprocessorDefinitions>__ENABLE_DISCORD__;__ENABLE_LIGHTFX__;USE_BENCHMARK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Breakpad)'=='true'">USE_BREAKPAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Platform)'=='Win32' || '$(Platform)'=='x64'">USE_FRIBIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Platform)'=='Win32' or '$(Platform)'=='x64'">USE_FRIBIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup>
|
||||
|
@ -176,6 +176,7 @@
|
|||
<ClInclude Include="core\Numerics.hpp" />
|
||||
<ClInclude Include="core\Path.hpp" />
|
||||
<ClInclude Include="core\Random.hpp" />
|
||||
<ClInclude Include="core\RTL.h" />
|
||||
<ClInclude Include="core\String.hpp" />
|
||||
<ClInclude Include="core\StringBuilder.hpp" />
|
||||
<ClInclude Include="core\StringReader.hpp" />
|
||||
|
@ -494,6 +495,8 @@
|
|||
<ClCompile Include="core\Json.cpp" />
|
||||
<ClCompile Include="core\MemoryStream.cpp" />
|
||||
<ClCompile Include="core\Path.cpp" />
|
||||
<ClCompile Include="core\RTL.FriBidi.cpp" />
|
||||
<ClCompile Include="core\RTL.ICU.cpp" />
|
||||
<ClCompile Include="core\String.cpp" />
|
||||
<ClCompile Include="core\Zip.cpp" />
|
||||
<ClCompile Include="core\ZipAndroid.cpp" />
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
#include "../common.h"
|
||||
#include "../core/FileStream.hpp"
|
||||
#include "../core/Memory.hpp"
|
||||
#include "../core/RTL.h"
|
||||
#include "../core/String.hpp"
|
||||
#include "../core/StringBuilder.hpp"
|
||||
#include "../core/StringReader.hpp"
|
||||
#include "Language.h"
|
||||
#include "Localisation.h"
|
||||
#include "RTL.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
|
|
Loading…
Reference in New Issue