diff options
| author | Michael Smith <mikesmiffy128@gmail.com> | 2022-01-06 23:04:26 +0000 |
|---|---|---|
| committer | Michael Smith <mikesmiffy128@gmail.com> | 2022-01-06 23:04:26 +0000 |
| commit | 6dac66008d2617d7eb4bd6efa09a2c7de47944b4 (patch) | |
| tree | 6c8038e9857d8f6ce64e636009aa06d4ff8289e6 /src | |
| parent | 0da31e9f420e573621712420bf71eb1ca8f6d07f (diff) | |
Fix build scripts and codegen on Linux
SST itself doesn't build, but it's a start!
Really interesting is the declaration after a switch label. That's of
course invalid, but Clang on Windows never complained. I guess it's an
MSVC extension, eh? How annoying.
Also, haha yes the script wasn't even executable. Forgot to
update-index when I remade the repo, I guess...
Diffstat (limited to 'src')
| -rw-r--r-- | src/build/cmeta.c | 14 | ||||
| -rw-r--r-- | src/build/mkgamedata.c | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/build/cmeta.c b/src/build/cmeta.c index 157ba92..7b7a767 100644 --- a/src/build/cmeta.c +++ b/src/build/cmeta.c @@ -98,13 +98,23 @@ static void die1(const char *s) { exit(100); } +#ifndef _WIN32 +static void die2(const char *s1, const char *s2) { + fprintf(stderr, "cmeta: fatal: %s%s\n", s1, s2); + exit(100); +} +#endif + static char *readsource(const os_char *f) { int fd = os_open(f, O_RDONLY); #ifndef _WIN32 if (fd == -1) die2("couldn't open ", f); #else - // TODO/FIXME/TEMP this is dumb and bad - if (fd == -1) { fprintf(stderr, "couldn't open %S", f); exit(100); } + // XXX: this is dumb and bad + if (fd == -1) { + fprintf(stderr, "cmeta: fatal: couldn't open %S", f); + exit(100); + } #endif uint bufsz = 8192; char *buf = malloc(bufsz); diff --git a/src/build/mkgamedata.c b/src/build/mkgamedata.c index bd7b2d5..ca2e130 100644 --- a/src/build/mkgamedata.c +++ b/src/build/mkgamedata.c @@ -86,7 +86,7 @@ static noreturn badparse(struct parsestate *state, const char *e) { static void kv_cb(enum kv_token type, const char *p, uint len, void *ctxt) { struct parsestate *state = ctxt; switch (type) { - case KV_IDENT: case KV_IDENT_QUOTED: + case KV_IDENT: case KV_IDENT_QUOTED:; char *k = malloc(len + 1); if (!k) die("couldn't allocate key string"); memcpy(k, p, len); |