diff --git a/Tuprules.gcc b/Tuprules.gcc index b6c044638..66db68bdb 100644 --- a/Tuprules.gcc +++ b/Tuprules.gcc @@ -40,8 +40,7 @@ LIBGCC = `$(CXX) $(CC_MARCH) -print-libgcc-file-name` !ld = | $(DEV_DIR)/ $(DEV_DIR)/ |> ^o LD %o^ $(LD) -o %o $(LDFLAGS) `$(PKG_CONFIG) --libs $(LIBS)` %f |> !incbin = |> ^ incbin %f^ \ - export SYM=_binary_`echo %f | sed 's/\./_/g'`; \ + export SYM=_binary_`echo %b | sed 's/\./_/g'`; \ echo ".global ${SYM}_start, ${SYM}_end; .data; .align 4; ${SYM}_start:; .incbin \"%f\"; ${SYM}_end:" \ - | llvm-mc -filetype=obj - > %o \ + | as $(AS_MARCH) -o %o - \ |> binary_%b.o - diff --git a/repos/gems/Tuprules.tup b/repos/gems/Tuprules.tup index 21762ca30..5d87e90da 100644 --- a/repos/gems/Tuprules.tup +++ b/repos/gems/Tuprules.tup @@ -1,5 +1,7 @@ REP_DIR = $(TUP_CWD) +CPPFLAGS += -I$(REP_DIR)/include + LIBS += genode-os ifndef NIX_OUTPUTS_DEV diff --git a/repos/gems/src/app/cpu_load_display/Tupfile b/repos/gems/src/app/cpu_load_display/Tupfile new file mode 100644 index 000000000..167ab4e9e --- /dev/null +++ b/repos/gems/src/app/cpu_load_display/Tupfile @@ -0,0 +1,4 @@ +include_rules +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/decorator/Tupfile b/repos/gems/src/app/decorator/Tupfile new file mode 100644 index 000000000..42c12c8b0 --- /dev/null +++ b/repos/gems/src/app/decorator/Tupfile @@ -0,0 +1,8 @@ +include_rules +CPPFLAGS += -I. -I$(REP_DIR)/../demo/include +SRC_BIN += $(REP_DIR)/../demo/src/app/scout/data/droidsansb10.tff +SRC_BIN += closer.rgba maximize.rgba minimize.rgba windowed.rgba +: foreach *.cc |> !cxx |> {obj} +: foreach $(SRC_BIN) |> !incbin |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/depot_autopilot/Tupfile b/repos/gems/src/app/depot_autopilot/Tupfile new file mode 100644 index 000000000..fd4b8d1a3 --- /dev/null +++ b/repos/gems/src/app/depot_autopilot/Tupfile @@ -0,0 +1,5 @@ +include_rules +CPPFLAGS += -I. +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/depot_deploy/Tupfile b/repos/gems/src/app/depot_deploy/Tupfile new file mode 100644 index 000000000..167ab4e9e --- /dev/null +++ b/repos/gems/src/app/depot_deploy/Tupfile @@ -0,0 +1,4 @@ +include_rules +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/depot_download_manager/Tupfile b/repos/gems/src/app/depot_download_manager/Tupfile new file mode 100644 index 000000000..167ab4e9e --- /dev/null +++ b/repos/gems/src/app/depot_download_manager/Tupfile @@ -0,0 +1,4 @@ +include_rules +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/depot_query/Tupfile b/repos/gems/src/app/depot_query/Tupfile new file mode 100644 index 000000000..d7bba8afe --- /dev/null +++ b/repos/gems/src/app/depot_query/Tupfile @@ -0,0 +1,5 @@ +include_rules +LIBS += vfs +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/driver_manager/Tupfile b/repos/gems/src/app/driver_manager/Tupfile new file mode 100644 index 000000000..f129c76d1 --- /dev/null +++ b/repos/gems/src/app/driver_manager/Tupfile @@ -0,0 +1,8 @@ +include_rules +ifneq ($(X86),) + +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> + +endif diff --git a/repos/gems/src/app/fs_query/Tupfile b/repos/gems/src/app/fs_query/Tupfile new file mode 100644 index 000000000..d7bba8afe --- /dev/null +++ b/repos/gems/src/app/fs_query/Tupfile @@ -0,0 +1,5 @@ +include_rules +LIBS += vfs +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/fs_tool/Tupfile b/repos/gems/src/app/fs_tool/Tupfile new file mode 100644 index 000000000..d7bba8afe --- /dev/null +++ b/repos/gems/src/app/fs_tool/Tupfile @@ -0,0 +1,5 @@ +include_rules +LIBS += vfs +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/nano3d/Tupfile b/repos/gems/src/app/nano3d/Tupfile new file mode 100644 index 000000000..fd4b8d1a3 --- /dev/null +++ b/repos/gems/src/app/nano3d/Tupfile @@ -0,0 +1,5 @@ +include_rules +CPPFLAGS += -I. +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/sculpt_manager/Tupfile b/repos/gems/src/app/sculpt_manager/Tupfile new file mode 100644 index 000000000..bca9674fd --- /dev/null +++ b/repos/gems/src/app/sculpt_manager/Tupfile @@ -0,0 +1,5 @@ +include_rules +CPPFLAGS += -I. -I../depot_deploy +: foreach *.cc view/*.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/app/window_layouter/Tupfile b/repos/gems/src/app/window_layouter/Tupfile new file mode 100644 index 000000000..fd4b8d1a3 --- /dev/null +++ b/repos/gems/src/app/window_layouter/Tupfile @@ -0,0 +1,5 @@ +include_rules +CPPFLAGS += -I. +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/server/nit_fader/Tufile b/repos/gems/src/server/nit_fader/Tufile new file mode 100644 index 000000000..b57b800a7 --- /dev/null +++ b/repos/gems/src/server/nit_fader/Tufile @@ -0,0 +1,5 @@ +include_rules +LIBS += blit +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/server/terminal/Tupfile b/repos/gems/src/server/terminal/Tupfile new file mode 100644 index 000000000..d7bba8afe --- /dev/null +++ b/repos/gems/src/server/terminal/Tupfile @@ -0,0 +1,5 @@ +include_rules +LIBS += vfs +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/server/wm/Tufile b/repos/gems/src/server/wm/Tufile new file mode 100644 index 000000000..947e65f54 --- /dev/null +++ b/repos/gems/src/server/wm/Tufile @@ -0,0 +1,4 @@ +include_rules +: foreach *.cc |> !cxx |> %B.o {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |> diff --git a/repos/gems/src/server/wm/Tupfile b/repos/gems/src/server/wm/Tupfile new file mode 100644 index 000000000..fd4b8d1a3 --- /dev/null +++ b/repos/gems/src/server/wm/Tupfile @@ -0,0 +1,5 @@ +include_rules +CPPFLAGS += -I. +: foreach *.cc |> !cxx |> {obj} +: {obj} |> !prg |> {bin} +: {bin} |> !collect_bin |>