It now builds properly!

This commit is contained in:
David Given
2025-03-18 01:05:07 +01:00
parent 06e29142e6
commit 3e505f47bc
4 changed files with 51 additions and 38 deletions

View File

@@ -31,6 +31,7 @@ def proto(self, name, srcs: Targets = [], deps: Targets = []):
]
)
if srcs:
dirs = sorted({"$[dir]/" + dirname(f) for f in filenamesof(srcs)})
simplerule(
replaces=self,
@@ -66,6 +67,18 @@ def proto(self, name, srcs: Targets = [], deps: Targets = []):
"protodeps": set(protodeps) | {self},
},
)
else:
simplerule(
replaces=self,
ins=protodeps,
outs=["=stamp"],
commands=["touch $[outs]"],
label="PROTO",
args={
"protosrcs": [],
"protodeps": set(protodeps),
},
)
@Rule

View File

@@ -21,6 +21,6 @@ cxxlibrary(
"fmt/printf.h": "./include/fmt/printf.h",
"fmt/ranges.h": "./include/fmt/ranges.h",
"fmt/std.h": "./include/fmt/std.h",
"fmt/xchar.h": "./include/fmt/xchar.h"
"fmt/xchar.h": "./include/fmt/xchar.h",
},
)

View File

@@ -14,7 +14,9 @@ destfile=$dir/dest.img
dd if=/dev/urandom of=$srcfile bs=1048576 count=2 2>&1
echo $fluxengine write $format -i $srcfile -d $fluxfile --drive.rotational_period_ms=200 $flags
$fluxengine write $format -i $srcfile -d $fluxfile --drive.rotational_period_ms=200 $flags
echo $fluxengine read $format -s $fluxfile -o $destfile --drive.rotational_period_ms=200 $flags
$fluxengine read $format -s $fluxfile -o $destfile --drive.rotational_period_ms=200 $flags
if [ ! -s $destfile ]; then
echo "Zero length output file!" >&2

View File

@@ -16,7 +16,7 @@ endif
"""
)
extrasrcs = []
extrasrcs = ["./layout.cpp"]
if config.windows:
extrasrcs += [
simplerule(
@@ -31,9 +31,7 @@ if config.windows:
cxxprogram(
name="gui",
srcs=glob("*.c", root_dir="src/gui") +
glob("*.h", root_dir="src/gui")
+ extrasrcs,
srcs=glob("src/gui/*.cc") + glob("src/gui/*.h") + extrasrcs,
cflags=["$(WX_CFLAGS)"],
ldflags=["$(WX_LDFLAGS)"],
deps=[