Skip to content

Commit 37c38b3

Browse files
committed
Merge remote-tracking branch 'origin/V8-5.1.300' into Linux-5.1.300
2 parents 5c9206e + c14f13c commit 37c38b3

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

Source/V8/V8.Build.cs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,15 @@ private bool LoadV8(TargetInfo Target)
7070
{
7171
if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32))
7272
{
73-
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Windows");
74-
75-
if (WindowsPlatform.Compiler == WindowsCompiler.VisualStudio2015)
76-
{
77-
LibrariesPath = Path.Combine(LibrariesPath, "MSVC2015");
78-
}
79-
else
80-
{
81-
LibrariesPath = Path.Combine(LibrariesPath, "MSVC2013");
82-
}
73+
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib");
8374

8475
if (Target.Platform == UnrealTargetPlatform.Win64)
8576
{
86-
LibrariesPath = Path.Combine(LibrariesPath, "x64");
77+
LibrariesPath = Path.Combine(LibrariesPath, "Win64");
8778
}
8879
else
89-
{
90-
LibrariesPath = Path.Combine(LibrariesPath, "x86");
80+
{
81+
LibrariesPath = Path.Combine(LibrariesPath, "Win32");
9182
}
9283

9384
if (Target.Configuration == UnrealTargetConfiguration.Debug)
@@ -97,7 +88,7 @@ private bool LoadV8(TargetInfo Target)
9788
else
9889
{
9990
LibrariesPath = Path.Combine(LibrariesPath, "Release");
100-
}
91+
}
10192

10293
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "v8_base_0.lib"));
10394
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "v8_base_1.lib"));
@@ -108,7 +99,7 @@ private bool LoadV8(TargetInfo Target)
10899
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "v8_nosnapshot.lib"));
109100

110101
Definitions.Add(string.Format("WITH_V8=1"));
111-
Definitions.Add(string.Format("WITH_V8_FAST_CALL=1"));
102+
Definitions.Add(string.Format("WITH_V8_FAST_CALL=0"));
112103
Definitions.Add(string.Format("WITH_JSWEBSOCKET=1"));
113104

114105
return true;

0 commit comments

Comments
 (0)