1
0
Fork 0

FreeType2: skip static lib, build custom source into libspectre.

This commit is contained in:
Henrik Hautakoski 2020-01-07 05:51:23 +01:00
parent 093149e72c
commit f5b7fa8178
No known key found for this signature in database
GPG key ID: 96765B12FEAC4745
247 changed files with 123377 additions and 88 deletions

21
bam.lua
View file

@ -80,11 +80,7 @@ settings.cc.includes:Add("include/")
settings.cc.includes:Add("source/")
-- FreeType2
if TARGET_OS == "Win32" then
settings.cc.includes:Add("vendor/FreeType2/include")
else
settings.cc.includes:Add("/usr/include/freetype2")
end
settings.cc.includes:Add("vendor/FreeType2/include")
-- STB
settings.cc.includes:Add("vendor/stb/include")
@ -194,6 +190,10 @@ local scene_module = Module("source/Scene", {
-- Build target
--------------------------------
-- Dependancies
Import("vendor/FreeType2/build.lua")
-- engine
local obj = Compile(settings, {
system_module,
platform_common_module,
@ -209,7 +209,8 @@ local obj = Compile(settings, {
local libspectre = StaticLibrary(settings,
"spectre",
obj
obj,
ft2_obj
)
--------------------------------
@ -230,14 +231,6 @@ if TARGET_OS == "Win32" then
-- Windows needs to link against these.
example_settings.link.libs:Add("opengl32", "gdi32", "user32")
-- Staticly link freetype on windows.
example_settings.link.libpath:Add("vendor/FreeType2/lib/x86")
if example_settings.debug > 0 then
example_settings.link.libs:Add("freetype-d-s")
else
example_settings.link.libs:Add("freetype-s")
end
end
-- For now, to get examples working