Update core uxn submodule
This commit is contained in:
parent
40898e8340
commit
e8b7a0b25c
4
Makefile
4
Makefile
|
@ -1,9 +1,7 @@
|
||||||
BASE_UXN := src/uxn
|
BASE_UXN := src/uxn
|
||||||
SRC_DIR ?= src
|
SRC_DIR ?= src
|
||||||
BUILD_DIR ?= build
|
BUILD_DIR ?= build
|
||||||
SRC_MAIN ?= $(SRC_DIR)/main.c \
|
SRC_MAIN ?= $(SRC_DIR)/main.c
|
||||||
$(BASE_UXN)/src/uxn.c \
|
|
||||||
$(BASE_UXN)/src/devices/system.c
|
|
||||||
EXE_NAME ?= uxnfb
|
EXE_NAME ?= uxnfb
|
||||||
BIN := $(BUILD_DIR)/$(EXE_NAME)
|
BIN := $(BUILD_DIR)/$(EXE_NAME)
|
||||||
UXN_HEAD := $(BASE_UXN)/src/uxn.h
|
UXN_HEAD := $(BASE_UXN)/src/uxn.h
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
|
|
||||||
#include "shorthand.h"
|
#include "shorthand.h"
|
||||||
#include "ppu.c"
|
#include "ppu.c"
|
||||||
#include "uxn/src/uxn.h"
|
#include "uxn/src/devices/system.c"
|
||||||
#include "uxn/src/devices/system.h"
|
#include "uxn/src/uxn.c"
|
||||||
|
|
||||||
#define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X))
|
#define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X))
|
||||||
|
|
||||||
|
|
2
src/uxn
2
src/uxn
|
@ -1 +1 @@
|
||||||
Subproject commit 56432c1fcdbca312aa58db6b83177771e0299fcf
|
Subproject commit 11c9ec8b49ae650005a3b7bd74269ff58ab09635
|
Loading…
Reference in New Issue