diff options
| -rw-r--r-- | core/compress.c (renamed from data/compress.c) | 0 | ||||
| -rw-r--r-- | core/render.c (renamed from data/render.c) | 0 | ||||
| -rw-r--r-- | core/salis.c (renamed from core.c) | 2 | ||||
| -rwxr-xr-x | salis.py | 6 |
4 files changed, 4 insertions, 4 deletions
diff --git a/data/compress.c b/core/compress.c index df61123..df61123 100644 --- a/data/compress.c +++ b/core/compress.c diff --git a/data/render.c b/core/render.c index f9da65d..f9da65d 100644 --- a/data/render.c +++ b/core/render.c @@ -15,7 +15,7 @@ #define UINT64_HALF 0x8000000000000000ul #if defined(COMPRESS) || defined(DATA_PUSH_PATH) -#include "data/compress.c" +#include "compress.c" #endif struct Proc { @@ -224,7 +224,7 @@ if args.command in ["serve"]: sqlx_defines = set() sqlx_links = set() - sqlx_flags.update({*args.compiler_flags.split(), "-shared", "-fPIC", "-Idata"}) + sqlx_flags.update({*args.compiler_flags.split(), "-shared", "-fPIC", "-Icore"}) sqlx_defines.add(f"-DMVEC_SIZE={2 ** args.mvec_pow}ul") if arch_vars.mvec_loop: sqlx_defines.add("-DMVEC_LOOP") @@ -243,7 +243,7 @@ if args.command in ["serve"]: sqlx_so = os.path.join(sqlx_tempdir.name, "render.so") info("Building salis SQLite extension at:", sqlx_so) - sqlx_build_cmd = [args.compiler, "data/render.c", "-o", sqlx_so] + sqlx_build_cmd = [args.compiler, "core/render.c", "-o", sqlx_so] sqlx_build_cmd.extend(sqlx_flags) sqlx_build_cmd.extend(sqlx_defines) sqlx_build_cmd.extend(sqlx_links) @@ -523,7 +523,7 @@ info("Created a temporary salis directory at:", tempdir.name) salis_bin = os.path.join(tempdir.name, "salis_bin") info("Building salis binary at:", salis_bin) -build_cmd = [args.compiler, "core.c", "-o", salis_bin] +build_cmd = [args.compiler, "core/salis.c", "-o", salis_bin] build_cmd.extend(flags) build_cmd.extend(sum(map(lambda include: ["-include", include], includes), [])) build_cmd.extend(defines) |