Skip to content

Commit a5c0b4e

Browse files
crocuiscrocuis
committed
fix Library Include
1 parent 19c034f commit a5c0b4e

File tree

1 file changed

+68
-69
lines changed

1 file changed

+68
-69
lines changed

‎Source/V8/V8.Build.cs

+68-69
Original file line numberDiff line numberDiff line change
@@ -143,102 +143,101 @@ private bool LoadV8(ReadOnlyTargetRules Target)
143143
}
144144
else if (Target.Platform == UnrealTargetPlatform.Android)
145145
{
146-
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Android");
147-
PublicLibraryPaths.Add(Path.Combine(LibrariesPath, "ARMv7"));
148-
PublicLibraryPaths.Add(Path.Combine(LibrariesPath, "ARM64"));
149-
PublicLibraryPaths.Add(Path.Combine(LibrariesPath, "x86"));
150-
PublicLibraryPaths.Add(Path.Combine(LibrariesPath, "x64"));
151-
152-
PublicAdditionalLibraries.Add("v8_base");
153-
PublicAdditionalLibraries.Add("v8_libbase");
154-
PublicAdditionalLibraries.Add("v8_libplatform");
155-
PublicAdditionalLibraries.Add("v8_nosnapshot");
156-
157-
if (v8_version[0] >= 6)
146+
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Android", "ARM64");
147+
148+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_init.a"));
149+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_initializers.a"));
150+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_base.a"));
151+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libbase.a"));
152+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libplatform.a"));
153+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_nosnapshot.a"));
154+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libsampler.a"));
155+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libtorque_base.a"));
156+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libtorque_generated_initializers.a"));
157+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libinspector.a"));
158+
159+
PublicDefinitions.Add(string.Format("WITH_V8=1"));
160+
161+
return true;
162+
}
163+
else if (Target.Platform == UnrealTargetPlatform.Linux)
164+
{
165+
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Linux");
166+
if (Target.Configuration == UnrealTargetConfiguration.Debug)
158167
{
159-
if (v8_version[1] >= 4)
160-
{
161-
PublicAdditionalLibraries.Add("v8_init");
162-
PublicAdditionalLibraries.Add("v8_initializers");
163-
}
164-
else
165-
{
166-
PublicAdditionalLibraries.Add("v8_builtins_setup");
167-
PublicAdditionalLibraries.Add("v8_builtins_generators");
168-
}
168+
LibrariesPath = Path.Combine(LibrariesPath, "Debug");
169169
}
170-
171-
if (ShouldLink_libsampler)
170+
else
172171
{
173-
PublicAdditionalLibraries.Add("v8_libsampler");
172+
LibrariesPath = Path.Combine(LibrariesPath, "Release");
174173
}
175174

175+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_init.a"));
176+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_initializers.a"));
177+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_base.a"));
178+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libbase.a"));
179+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libplatform.a"));
180+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_nosnapshot.a"));
181+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libsampler.a"));
182+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libtorque_base.a"));
183+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libtorque_generated_initializers.a"));
184+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libinspector.a"));
185+
176186
PublicDefinitions.Add(string.Format("WITH_V8=1"));
177187

178188
return true;
179189
}
180-
else if (Target.Platform == UnrealTargetPlatform.Linux)
190+
else if (Target.Platform == UnrealTargetPlatform.Mac)
181191
{
182-
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Linux");
183-
PublicLibraryPaths.Add(Path.Combine(LibrariesPath, "x64"));
184-
185-
PublicAdditionalLibraries.Add("v8_base");
186-
PublicAdditionalLibraries.Add("v8_libbase");
187-
PublicAdditionalLibraries.Add("v8_libplatform");
188-
PublicAdditionalLibraries.Add("v8_nosnapshot");
192+
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Mac");
189193

190-
if (v8_version[0] >= 6)
194+
if (Target.Configuration == UnrealTargetConfiguration.Debug)
191195
{
192-
if (v8_version[1] >= 4)
193-
{
194-
PublicAdditionalLibraries.Add("v8_init");
195-
PublicAdditionalLibraries.Add("v8_initializers");
196-
}
197-
else
198-
{
199-
PublicAdditionalLibraries.Add("v8_builtins_setup");
200-
PublicAdditionalLibraries.Add("v8_builtins_generators");
201-
}
196+
LibrariesPath = Path.Combine(LibrariesPath, "Debug");
202197
}
203-
204-
if (ShouldLink_libsampler)
198+
else
205199
{
206-
PublicAdditionalLibraries.Add("v8_libsampler");
200+
LibrariesPath = Path.Combine(LibrariesPath, "Release");
207201
}
208202

203+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_init.a"));
204+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_initializers.a"));
205+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_base.a"));
206+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libbase.a"));
207+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libplatform.a"));
208+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_nosnapshot.a"));
209+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libsampler.a"));
210+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libtorque_base.a"));
211+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libtorque_generated_initializers.a"));
212+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libinspector.a"));
213+
209214
PublicDefinitions.Add(string.Format("WITH_V8=1"));
210215

211216
return true;
212217
}
213-
else if (Target.Platform == UnrealTargetPlatform.Mac)
218+
else if (Target.Platform == UnrealTargetPlatform.IOS)
214219
{
215-
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Mac", "x64");
216-
PublicLibraryPaths.Add(LibrariesPath);
217-
218-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_base.a"));
219-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_libbase.a"));
220-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_libplatform.a"));
221-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_nosnapshot.a"));
220+
string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "IOS");
222221

223-
if (v8_version[0] >= 6)
222+
if (Target.Configuration == UnrealTargetConfiguration.Debug)
224223
{
225-
if (v8_version[1] >= 4)
226-
{
227-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_init.a"));
228-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_initializers.a"));
229-
}
230-
else
231-
{
232-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_builtins_setup.a"));
233-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath,"libv8_builtins_generators.a"));
234-
}
224+
LibrariesPath = Path.Combine(LibrariesPath, "Debug");
235225
}
236-
237-
if (ShouldLink_libsampler)
226+
else
238227
{
239-
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libsampler.a"));
228+
LibrariesPath = Path.Combine(LibrariesPath, "Release");
240229
}
241230

231+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_init.a"));
232+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_initializers.a"));
233+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_base.a"));
234+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libbase.a"));
235+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libplatform.a"));
236+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_nosnapshot.a"));
237+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libv8_libsampler.a"));
238+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libtorque_generated_initializers.a"));
239+
PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libinspector.a"));
240+
242241
PublicDefinitions.Add(string.Format("WITH_V8=1"));
243242

244243
return true;

0 commit comments

Comments
 (0)