Compare commits

..

2 Commits

7 changed files with 32 additions and 27 deletions

View File

@ -57,7 +57,7 @@ function m.generateproject(liboutdir, intdir)
end end
function m.link() function m.link()
externalincludedirs includedirs
{ {
path.join(rootdir, "flac/include"), path.join(rootdir, "flac/include"),
path.join(rootdir, "flac/src/libFLAC/include"), path.join(rootdir, "flac/src/libFLAC/include"),

View File

@ -79,6 +79,11 @@ function m.generateproject(liboutdir, intdir)
path.join(rootdir, "freetype/builds/windows/ftdebug.c"), path.join(rootdir, "freetype/builds/windows/ftdebug.c"),
} }
removefiles
{
path.join(rootdir, "freetype/src/base/ftdebug.c"),
}
filter"system:linux" filter"system:linux"
files{path.join(rootdir, "freetype/builds/unix/ftsystem.c")} files{path.join(rootdir, "freetype/builds/unix/ftsystem.c")}
@ -89,7 +94,7 @@ function m.generateproject(liboutdir, intdir)
end end
function m.link() function m.link()
externalincludedirs{path.join(rootdir, "freetype/include")} includedirs{path.join(rootdir, "freetype/include")}
links {"freetype"} links {"freetype"}
end end

View File

@ -1,7 +1,7 @@
local m = {} local m = {}
local rootdir = path.join(path.getabsolute(path.getdirectory(_SCRIPT)), "../") local rootdir = path.join(path.getabsolute(path.getdirectory(_SCRIPT)), "../")
local sfml = require("../build-sfml") local sfml = require("build-sfml")
function m.generateproject(liboutdir, intdir) function m.generateproject(liboutdir, intdir)
project"imgui-sfml" project"imgui-sfml"
@ -11,29 +11,28 @@ function m.generateproject(liboutdir, intdir)
objdir(intdir) objdir(intdir)
warnings"Off" warnings"Off"
defines{"IMGUI_USER_CONFIG=\"imconfig-SFML.h\""} defines{"IMGUI_USER_CONFIG=\"imconfig-SFML.h\"", "SFML_STATIC"}
sfml.link()
includedirs
{
path.join(rootdir, "imgui-sfml"),
path.join(rootdir, "imgui"),
}
files files
{ {
path.join(rootdir, "imgui-sfml/imgui-SFML.cpp"), path.join(rootdir, "imgui-sfml/imgui-SFML.cpp"),
} }
includedirs
{
path.join(rootdir, "imgui-sfml"),
path.join(rootdir, "imgui"),
path.join(rootdir, "SFML/include"),
}
links {"sfml"}
end end
function m.config() -- use this in build imgui instead of link() to avoid circular dependency function m.config() -- use this in build imgui instead of link() to avoid circular dependency
defines { "IMGUI_USER_CONFIG=\"imconfig-SFML.h\"" } defines { "IMGUI_USER_CONFIG=\"imconfig-SFML.h\"" }
externalincludedirs { path.join(rootdir, "imgui-sfml") } includedirs { path.join(rootdir, "imgui-sfml"), path.join(rootdir, "SFML/include") }
sfml.link()
end end
function m.link() function m.link()

View File

@ -11,7 +11,6 @@ function m.generateproject(liboutdir, intdir)
objdir(intdir) objdir(intdir)
warnings"Off" warnings"Off"
imguisfml.config() -- needed so imgui can be aware of imconfig-sfml.h
includedirs includedirs
{ {
@ -25,12 +24,14 @@ function m.generateproject(liboutdir, intdir)
path.join(rootdir, "imgui/imgui_tables.cpp"), path.join(rootdir, "imgui/imgui_tables.cpp"),
path.join(rootdir, "imgui/imgui_widgets.cpp"), path.join(rootdir, "imgui/imgui_widgets.cpp"),
} }
imguisfml.config() -- needed so imgui can be aware of imconfig-sfml.h
end end
function m.link() function m.link()
links {"imgui"} links {"imgui"}
externalincludedirs { path.join(rootdir, "imgui") } includedirs { path.join(rootdir, "imgui") }
end end
return m return m

View File

@ -22,7 +22,7 @@ end
function m.link() function m.link()
links{"ogg"} links{"ogg"}
externalincludedirs{path.join(rootdir, "ogg/include")} includedirs{path.join(rootdir, "ogg/include")}
end end
return m return m

View File

@ -15,12 +15,6 @@ function m.generateproject(liboutdir, intdir)
objdir(intdir) objdir(intdir)
warnings"Off" warnings"Off"
freetype.link()
ogg.link()
flac.link()
vorbis.link()
defines defines
{ {
"SFML_STATIC", "SFML_STATIC",
@ -49,7 +43,6 @@ function m.generateproject(liboutdir, intdir)
path.join(rootdir, "SFML/extlibs/headers/vulkan"), path.join(rootdir, "SFML/extlibs/headers/vulkan"),
} }
files files
{ {
path.join(rootdir, "SFML/include/SFML/**.hpp"), path.join(rootdir, "SFML/include/SFML/**.hpp"),
@ -58,6 +51,11 @@ function m.generateproject(liboutdir, intdir)
path.join(rootdir, "SFML/src/SFML/**.cpp"), path.join(rootdir, "SFML/src/SFML/**.cpp"),
} }
freetype.link()
ogg.link()
flac.link()
vorbis.link()
filter"system:windows" filter"system:windows"
removefiles removefiles
{ {
@ -73,6 +71,8 @@ function m.generateproject(liboutdir, intdir)
path.join(rootdir, "SFML/src/SFML/Window/DRM/**"), path.join(rootdir, "SFML/src/SFML/Window/DRM/**"),
path.join(rootdir, "SFML/src/SFML/Window/Android/**"), path.join(rootdir, "SFML/src/SFML/Window/Android/**"),
path.join(rootdir, "SFML/src/SFML/System/Android/**"), path.join(rootdir, "SFML/src/SFML/System/Android/**"),
path.join(rootdir, "SFML/src/SFML/Main/MainAndroid.cpp"),
path.join(rootdir, "SFML/src/SFML/Main/MainiOS.cpp"),
} }
filter"system:linux" filter"system:linux"
@ -97,7 +97,7 @@ end
function m.link() function m.link()
defines{"SFML_STATIC"} defines{"SFML_STATIC"}
externalincludedirs includedirs
{ {
path.join(rootdir, "SFML/include"), path.join(rootdir, "SFML/include"),
} }

View File

@ -71,7 +71,7 @@ end
function m.link() function m.link()
links {"vorbis"} links {"vorbis"}
ogg.link() ogg.link()
externalincludedirs includedirs
{ {
path.join(rootdir, "vorbis/include"), path.join(rootdir, "vorbis/include"),
} }