diff options
author | Bad Diode <bd@badd10de.dev> | 2022-03-05 22:51:07 +0100 |
---|---|---|
committer | Bad Diode <bd@badd10de.dev> | 2022-03-05 22:51:07 +0100 |
commit | 40898e8340d8fe1ec73c0e7afb10cd257d62510a (patch) | |
tree | 9dfccb0939b0e5b6f371c37ff1508d32df7e3ada | |
parent | 8c40fb31d36488b99045b7fa3641f8ce2cf1ff99 (diff) | |
download | uxnfb-40898e8340d8fe1ec73c0e7afb10cd257d62510a.tar.gz uxnfb-40898e8340d8fe1ec73c0e7afb10cd257d62510a.zip |
Change build system to avoid compilation errors
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | src/main.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -1,7 +1,9 @@ | |||
1 | BASE_UXN := src/uxn | 1 | BASE_UXN := src/uxn |
2 | SRC_DIR ?= src | 2 | SRC_DIR ?= src |
3 | BUILD_DIR ?= build | 3 | BUILD_DIR ?= build |
4 | SRC_MAIN ?= $(SRC_DIR)/main.c | 4 | SRC_MAIN ?= $(SRC_DIR)/main.c \ |
5 | $(BASE_UXN)/src/uxn.c \ | ||
6 | $(BASE_UXN)/src/devices/system.c | ||
5 | EXE_NAME ?= uxnfb | 7 | EXE_NAME ?= uxnfb |
6 | BIN := $(BUILD_DIR)/$(EXE_NAME) | 8 | BIN := $(BUILD_DIR)/$(EXE_NAME) |
7 | UXN_HEAD := $(BASE_UXN)/src/uxn.h | 9 | UXN_HEAD := $(BASE_UXN)/src/uxn.h |
@@ -10,8 +10,8 @@ | |||
10 | 10 | ||
11 | #include "shorthand.h" | 11 | #include "shorthand.h" |
12 | #include "ppu.c" | 12 | #include "ppu.c" |
13 | #include "uxn/src/devices/system.c" | 13 | #include "uxn/src/uxn.h" |
14 | #include "uxn/src/uxn.c" | 14 | #include "uxn/src/devices/system.h" |
15 | 15 | ||
16 | #define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X)) | 16 | #define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X)) |
17 | 17 | ||