xmake: Add support for shader editor

This commit is contained in:
Jérôme Leclercq 2021-05-07 13:40:32 +02:00
parent 24c2de405f
commit 3221dfdb09
4 changed files with 108 additions and 0 deletions

24
tools/xmake.lua Normal file
View File

@ -0,0 +1,24 @@
add_requires("nodeeditor", {debug = is_mode("debug"), optional = true})
target("NazaraShaderNodes")
set_group("Tools")
set_kind("binary")
add_rules("qt.console", "qt.moc")
add_deps("NazaraShader")
add_frameworks("QtCore", "QtGui", "QtWidgets")
add_packages("nodeeditor")
add_includedirs("../src")
add_headerfiles("../src/ShaderNode/**.hpp", "../src/ShaderNode/**.inl")
add_files("../src/ShaderNode/**.cpp")
on_load(function (target)
import("detect.sdks.find_qt")
if (not has_package("nodeeditor") or not find_qt()) then
-- Disable building by default if nodeeditor or Qt is not found
target:set("default", false)
end
end)

View File

@ -0,0 +1,34 @@
diff --git a/include/nodes/internal/NodePainterDelegate.hpp b/include/nodes/internal/NodePainterDelegate.hpp
index d532619..f22496c 100644
--- a/include/nodes/internal/NodePainterDelegate.hpp
+++ b/include/nodes/internal/NodePainterDelegate.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include <QPainter>
+#include <QtGui/QPainter>
#include "NodeGeometry.hpp"
#include "NodeDataModel.hpp"
diff --git a/include/nodes/internal/QStringStdHash.hpp b/include/nodes/internal/QStringStdHash.hpp
index 3d47a3f..cc5eb68 100644
--- a/include/nodes/internal/QStringStdHash.hpp
+++ b/include/nodes/internal/QStringStdHash.hpp
@@ -1,5 +1,11 @@
#pragma once
+#include <QtGlobal>
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+
+// As of 5.14 there is a specialization std::hash<QString>
+
#include <functional>
#include <QtCore/QString>
@@ -17,3 +23,5 @@ struct hash<QString>
}
};
}
+
+#endif

View File

@ -0,0 +1,46 @@
package("nodeeditor")
set_homepage("https://github.com/paceholder/nodeeditor")
set_description("Qt Node Editor. Dataflow programming framework")
set_license("BSD-3")
set_urls("https://github.com/paceholder/nodeeditor/archive/refs/tags/$(version).tar.gz",
"https://github.com/paceholder/nodeeditor.git")
add_versions("2.1.3", "4e3194a04ac4a2a2bf4bc8eb6cc27d5cc154923143c1ecf579ce7f0115a90585")
add_patches("2.1.3", path.join(os.scriptdir(), "patches", "2.1.3", "fix_qt.patch"), "804ee98d47b675c578981414ed25a745f1b12d0cd8b03ea7d7b079c7e1ce1ea9")
add_deps("cmake")
on_load(function (package)
if package:config("shared") then
package:add("defines", "NODE_EDITOR_SHARED")
else
package:add("defines", "NODE_EDITOR_STATIC")
end
end)
on_install("windows", "linux", "mingw", "macosx", function (package)
import("detect.sdks.find_qt")
local qt = find_qt()
local configs = {"-DBUILD_EXAMPLES=OFF", "-DBUILD_TESTING=OFF"}
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
if qt then
table.insert(configs, "-DQt5_DIR=" .. path.join(qt.libdir, "cmake", "Qt5"))
end
import("package.tools.cmake").install(package, configs)
end)
on_test(function (package)
do
-- Disable test until I can test with Qt
return
end
assert(package:check_cxxsnippets({test = [[
void test() {
QtNodes::FlowScene scene(std::make_shared<QtNodes::DataModelRegistry>());
QtNodes::FlowView view(&scene);
}
]]}, {configs = {languages = "c++11"}, includes = {"nodes/FlowScene", "nodes/FlowView"}}))
end)

View File

@ -84,6 +84,8 @@ local modules = {
}
}
add_repositories("local-repo xmake-repo")
add_requires("chipmunk2d", "freetype", "libsndfile", "libsdl")
add_requires("newtondynamics", { debug = is_mode("debug") })
@ -163,9 +165,11 @@ for name, module in pairs(modules) do
end
end
includes("tools/xmake.lua")
includes("plugins/*/xmake.lua")
includes("examples/*/xmake.lua")
-- Adds -d as a debug suffix
rule("debug_suffix")
on_load(function (target)
if target:kind() ~= "binary" then