From f4d0f4f9e3563644129e672081c97c589103cf5a Mon Sep 17 00:00:00 2001
From: Bad Diode <bd@badd10de.dev>
Date: Sun, 23 May 2021 23:59:43 +0200
Subject: Fix warnings and compilation issues on macOS

---
 Makefile              | 11 +++++++----
 src/filesystem.c      |  2 +-
 src/uxn/devices/ppu.c | 10 +++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 427861c..100c861 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ SRC_MAIN    := $(SRC_DIR)/main.c
 ROM         := $(BUILD_DIR)/rom.c
 ROM_SRC     := roms/dvd.rom
 ASM_FILES   := $(wildcard $(SRC_DIR)/*.s)
-WATCH_SRC   := $(shell find $(SRC_DIRS) -name *.c -or -name *.s -or -name *.h)
+WATCH_SRC   := $(shell find $(SRC_DIR) -name *.c -or -name *.s -or -name *.h)
 INC_DIRS    := $(shell find $(SRC_DIR) -type d)
 INC_DIRS    += $(BUILD_DIR)
 INC_FLAGS   := $(addprefix -I,$(INC_DIRS))
@@ -29,6 +29,9 @@ TARGET         := uxngba
 ELF            := $(BUILD_DIR)/$(TARGET).elf
 BIN            := $(BUILD_DIR)/$(TARGET).gba
 
+# Target tools.
+TOOLS_BIN2CARR := tools/bin2carr/build/bin2carr
+
 # Compiler and linker configuration.
 CC             := $(DEVKITBIN)/arm-none-eabi-gcc
 OBJCOPY        := $(DEVKITBIN)/arm-none-eabi-objcopy
@@ -57,9 +60,9 @@ else
     CFLAGS += $(RELEASE_CFLAGS)
 endif
 
-main: tools $(BUILD_DIR) $(ROM) $(BIN)
+main: $(BUILD_DIR) $(ROM) $(BIN)
 
-$(ROM):
+$(ROM): $(TOOLS_BIN2CARR)
 	./tools/bin2carr/build/bin2carr -n uxn_rom -e u16 -o $(ROM) $(ROM_SRC)
 
 # Strip and fix header to create final .gba file.
@@ -83,5 +86,5 @@ run: main
 clean:
 	rm -rf $(BUILD_DIR)
 
-tools:
+$(TOOLS_BIN2CARR):
 	make -C tools/bin2carr
diff --git a/src/filesystem.c b/src/filesystem.c
index 5732e40..6737386 100644
--- a/src/filesystem.c
+++ b/src/filesystem.c
@@ -55,7 +55,7 @@ fs_init() {
         // Initialize filesystem.
         filesystem.num_files = 0;
         filesystem.data_size = 0;
-        filesystem.data_capacity = 27 * FILE_MAX_SIZE;
+        filesystem.data_capacity = (u16)(FILE_CAPACITY * FILE_MAX_SIZE);
         memset(&filesystem.files, 0, FILE_CAPACITY * sizeof(File));
         _fs_write(&filesystem, FILE_HEADER_OFFSET, offsetof(FileSystem, files));
     } else {
diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index e453726..7a4429c 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -329,11 +329,11 @@ toggle_keyboard(void) {
 }
 
 void
-update_cursor(int pos) {
+update_cursor(u8 pos) {
     cursor_position = CLAMP(pos, 0, LEN(keyboard) - 1);
-    OBJ_ATTR_0(127) = OBJ_ATTR_0(127) & ~0xFF
+    OBJ_ATTR_0(127) = (OBJ_ATTR_0(127) & ~0xFF)
         | OBJ_Y_COORD(keyboard[cursor_position].y);
-    OBJ_ATTR_1(127) = OBJ_ATTR_0(127) & ~0x1FF
+    OBJ_ATTR_1(127) = (OBJ_ATTR_0(127) & ~0x1FF)
         | OBJ_X_COORD(keyboard[cursor_position].x);
 }
 
@@ -403,7 +403,7 @@ initppu(Ppu *p, u8 hor, u8 ver, u8 pad) {
         keyboard[i].y = tile_y * 8;
         OBJ_ATTR_0(i) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[i].y);
         OBJ_ATTR_1(i) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[i].x);
-        OBJ_ATTR_2(i) = SPRITE_START_IDX + keyboard[i].symbol | OBJ_PAL_BANK(0);
+        OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(0);
         tile_x++;
         if (tile_x - KEYBOARD_START_TILE_X >= KEYBOARD_ROW_SIZE) {
             tile_x = KEYBOARD_START_TILE_X;
@@ -412,7 +412,7 @@ initppu(Ppu *p, u8 hor, u8 ver, u8 pad) {
     }
     OBJ_ATTR_0(127) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[cursor_position].y);
     OBJ_ATTR_1(127) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[cursor_position].x);
-    OBJ_ATTR_2(127) = SPRITE_START_IDX + 0xdb | OBJ_PAL_BANK(3);
+    OBJ_ATTR_2(127) = (SPRITE_START_IDX + 0xdb) | OBJ_PAL_BANK(3);
 
     return 1;
 }
-- 
cgit v1.2.1