bam.lua: Win32: move freetype libpath to examples settings.
This commit is contained in:
parent
c97c75d56f
commit
effc723f54
1 changed files with 2 additions and 3 deletions
5
bam.lua
5
bam.lua
|
|
@ -82,9 +82,6 @@ settings.cc.includes:Add("source/")
|
||||||
-- FreeType2
|
-- FreeType2
|
||||||
if TARGET_OS == "Win32" then
|
if TARGET_OS == "Win32" then
|
||||||
settings.cc.includes:Add("vendor/FreeType2/include")
|
settings.cc.includes:Add("vendor/FreeType2/include")
|
||||||
|
|
||||||
-- Staticly link freetype on windows.
|
|
||||||
settings.link.libpath:Add("vendor/FreeType2/lib/x86")
|
|
||||||
else
|
else
|
||||||
settings.cc.includes:Add("/usr/include/freetype2")
|
settings.cc.includes:Add("/usr/include/freetype2")
|
||||||
end
|
end
|
||||||
|
|
@ -233,6 +230,8 @@ if TARGET_OS == "Win32" then
|
||||||
-- Windows needs to link against these.
|
-- Windows needs to link against these.
|
||||||
example_settings.link.libs:Add("opengl32", "gdi32", "user32")
|
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
|
if example_settings.debug > 0 then
|
||||||
example_settings.link.libs:Add("freetype-d-s")
|
example_settings.link.libs:Add("freetype-d-s")
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue