aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2022-03-05 22:51:07 +0100
committerBad Diode <bd@badd10de.dev>2022-03-05 22:51:07 +0100
commit40898e8340d8fe1ec73c0e7afb10cd257d62510a (patch)
tree9dfccb0939b0e5b6f371c37ff1508d32df7e3ada
parent8c40fb31d36488b99045b7fa3641f8ce2cf1ff99 (diff)
downloaduxnfb-40898e8340d8fe1ec73c0e7afb10cd257d62510a.tar.gz
uxnfb-40898e8340d8fe1ec73c0e7afb10cd257d62510a.zip
Change build system to avoid compilation errors
-rw-r--r--Makefile4
-rw-r--r--src/main.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 8c56874..83585f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
1BASE_UXN := src/uxn 1BASE_UXN := src/uxn
2SRC_DIR ?= src 2SRC_DIR ?= src
3BUILD_DIR ?= build 3BUILD_DIR ?= build
4SRC_MAIN ?= $(SRC_DIR)/main.c 4SRC_MAIN ?= $(SRC_DIR)/main.c \
5 $(BASE_UXN)/src/uxn.c \
6 $(BASE_UXN)/src/devices/system.c
5EXE_NAME ?= uxnfb 7EXE_NAME ?= uxnfb
6BIN := $(BUILD_DIR)/$(EXE_NAME) 8BIN := $(BUILD_DIR)/$(EXE_NAME)
7UXN_HEAD := $(BASE_UXN)/src/uxn.h 9UXN_HEAD := $(BASE_UXN)/src/uxn.h
diff --git a/src/main.c b/src/main.c
index 222fef3..025b2e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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