diff --git a/bam.lua b/bam.lua index facf8b6..6b7d9e8 100644 --- a/bam.lua +++ b/bam.lua @@ -82,10 +82,10 @@ settings.cc.includes:Add("source/") -- FreeType2 if TARGET_OS == "Win32" then 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") end @@ -155,18 +155,18 @@ local graphics_module = Module("source/Graphics", { "Shader.cpp", "ShaderProgram.cpp", "Texture.cpp", - + -- Text "Font/FontDriver.cpp", "Font/FreeTypeDriver.cpp", "Font/FreeTypeError.cpp", "Font.cpp", "Text.cpp", - + -- Image "Image.cpp", "ImageLoader.cpp", - + "OpenGL.cpp", "GL/glad.c", "GL/CheckError.cpp", @@ -209,8 +209,8 @@ local obj = Compile(settings, { scene_module }) -local libspectre = StaticLibrary(settings, - "spectre", +local libspectre = StaticLibrary(settings, + "spectre", obj ) @@ -232,7 +232,7 @@ if TARGET_OS == "Win32" then -- Windows needs to link against these. example_settings.link.libs:Add("opengl32", "gdi32", "user32") - + if example_settings.debug > 0 then example_settings.link.libs:Add("freetype-d-s") else @@ -244,6 +244,6 @@ end -- we copy the whole assets directory. assets = CopyDir(PathJoin(paths.build, paths.examples), "assets") -BuildExamples(example_settings, { +BuildExamples(example_settings, { "text" -}, assets) \ No newline at end of file +}, assets)