diff options
author | Bad Diode <bd@badd10de.dev> | 2022-03-05 23:01:59 +0100 |
---|---|---|
committer | Bad Diode <bd@badd10de.dev> | 2022-03-05 23:01:59 +0100 |
commit | e8b7a0b25cb9c7a9f4076a93bb80171f2bcd4526 (patch) | |
tree | bfd1f27ccf9481812a75e5ece36ce566d3d2a522 | |
parent | 40898e8340d8fe1ec73c0e7afb10cd257d62510a (diff) | |
download | uxnfb-e8b7a0b25cb9c7a9f4076a93bb80171f2bcd4526.tar.gz uxnfb-e8b7a0b25cb9c7a9f4076a93bb80171f2bcd4526.zip |
Update core uxn submodule
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | src/main.c | 4 | ||||
m--------- | src/uxn | 0 |
3 files changed, 3 insertions, 5 deletions
@@ -1,9 +1,7 @@ | |||
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 | ||
7 | EXE_NAME ?= uxnfb | 5 | EXE_NAME ?= uxnfb |
8 | BIN := $(BUILD_DIR)/$(EXE_NAME) | 6 | BIN := $(BUILD_DIR)/$(EXE_NAME) |
9 | UXN_HEAD := $(BASE_UXN)/src/uxn.h | 7 | 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/uxn.h" | 13 | #include "uxn/src/devices/system.c" |
14 | #include "uxn/src/devices/system.h" | 14 | #include "uxn/src/uxn.c" |
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 | ||
diff --git a/src/uxn b/src/uxn | |||
Subproject 56432c1fcdbca312aa58db6b83177771e0299fc | Subproject 11c9ec8b49ae650005a3b7bd74269ff58ab0963 | ||