From 82f7b4a646f75704fbbe3ac5bc579c73fe41ea15 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 24 Oct 2016 23:15:06 -0700 Subject: Add velox scm --- .gitmodules | 3 +++ desktop/gen.rc | 1 + desktop/velox/gen.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ desktop/velox/rev | 1 + desktop/velox/src | 1 + 5 files changed, 48 insertions(+) create mode 100644 desktop/velox/gen.rc create mode 100644 desktop/velox/rev create mode 160000 desktop/velox/src diff --git a/.gitmodules b/.gitmodules index 3cfd3f3d..ceab2e7b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -99,6 +99,9 @@ [submodule "desktop/swc/src"] path = desktop/swc/src url = https://github.com/michaelforney/swc +[submodule "desktop/velox/src"] + path = desktop/velox/src + url = https://github.com/michaelforney/velox [submodule "desktop/wayland/src"] path = desktop/wayland/src url = https://anongit.freedesktop.org/git/wayland/wayland.git diff --git a/desktop/gen.rc b/desktop/gen.rc index cb48b831..3b84c510 100644 --- a/desktop/gen.rc +++ b/desktop/gen.rc @@ -10,6 +10,7 @@ subgen pixman subgen plan9fonts subgen swc subgen terminus-font +subgen velox subgen wayland subgen wayland-protocols subgen wld diff --git a/desktop/velox/gen.rc b/desktop/velox/gen.rc new file mode 100644 index 00000000..5247a674 --- /dev/null +++ b/desktop/velox/gen.rc @@ -0,0 +1,42 @@ +cflags\ + -D 'VELOX_LIBEXEC=''"/libexec/velox"''' \ + -isystem desktop/fontconfig/src\ + -isystem desktop/libxkbcommon/src\ + -isystem desktop/swc/src/libswc\ + -isystem '$builddir'/desktop/pixman/include\ + -isystem '$builddir'/desktop/swc/include\ + -isystem '$builddir'/desktop/wayland/include\ + -isystem '$builddir'/desktop/wld/include\ + -I '$outdir' + +waylandproto protocol/velox.xml\ + protocol/velox-^(client server)^-protocol.h velox-protocol.c +build '$outdir'/protocol/swc-client-protocol.h copy '$builddir'/desktop/swc/include/swc-client-protocol.h + +phony deps\ + phony/desktop/^(pixman swc wayland wld)^/headers\ + protocol/^(swc-client velox-^(client server))^-protocol.h + +exe velox -d 'phony/$dir/deps' \ + config.c\ + layout.c\ + screen.c\ + tag.c\ + util.c\ + velox.c\ + velox-protocol.c.o\ + window.c\ + '$builddir'/^(\ + desktop/swc/libswc.a.d\ + desktop/wayland/libwayland-server.a.d\ + ) +file bin/velox '$outdir'/velox 755 + +exe status_bar -d 'phony/$dir/deps' clients/status_bar.c velox-protocol.c.o '$builddir'/^(\ + desktop/swc/swc-protocol.c.o\ + desktop/wld/libwld.a.d\ + desktop/wayland/libwayland-client.a.d\ +) +file libexec/velox/status_bar '$outdir'/status_bar 755 + +fetch git diff --git a/desktop/velox/rev b/desktop/velox/rev new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/desktop/velox/rev @@ -0,0 +1 @@ +1 diff --git a/desktop/velox/src b/desktop/velox/src new file mode 160000 index 00000000..ba236170 --- /dev/null +++ b/desktop/velox/src @@ -0,0 +1 @@ +Subproject commit ba236170ccde11ae2b828d29093ab27711e68969 -- cgit v1.2.3