Change build system to avoid compilation errors

This commit is contained in:
Bad Diode 2022-03-05 22:51:07 +01:00
parent 8c40fb31d3
commit 40898e8340
2 changed files with 5 additions and 3 deletions

View File

@ -1,7 +1,9 @@
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

View File

@ -10,8 +10,8 @@
#include "shorthand.h" #include "shorthand.h"
#include "ppu.c" #include "ppu.c"
#include "uxn/src/devices/system.c" #include "uxn/src/uxn.h"
#include "uxn/src/uxn.c" #include "uxn/src/devices/system.h"
#define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X)) #define CLAMP(X, MIN, MAX) ((X) <= (MIN) ? (MIN) : (X) > (MAX) ? (MAX): (X))