update

Author: slmjkdbtl

Makefile

@@ -49,6 +49,8 @@ CFLAGS += -Wno-unused-variable
 CFLAGS += -Wno-unused-but-set-variable
 CFLAGS += -Wno-gnu-label-as-value
 CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
+CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
+CFLAGS += -Wno-missing-braces
 
 ifdef DEBUG
 CFLAGS += -O0 -g
@@ -141,7 +143,7 @@ ifeq ($(TARGET),web)
 		python3 -m http.server 8000
 else ifeq ($(TARGET),iossim)
 	@if [ -z "$(SIMULATOR)" ]; then \
-		echo "SIMULATOR not set"; \
+		echo "SIMULATOR not set, run 'xcrun simctl list' and select a device"; \
 		exit 1; \
 	fi
 	$(MAKE) bundle

d_app.h

@@ -117,11 +117,11 @@ typedef enum {
 } d_key;
 
 typedef enum {
-	D_KMOD_ALT,
-	D_KMOD_META,
-	D_KMOD_CTRL,
-	D_KMOD_SHIFT,
-} d_kmod;
+	D_KEYMOD_ALT,
+	D_KEYMOD_META,
+	D_KEYMOD_CTRL,
+	D_KEYMOD_SHIFT,
+} d_keymod;
 
 typedef enum {
 	D_MOUSE_NONE,
@@ -194,7 +194,7 @@ bool d_app_has_focus(void);
 
 bool d_app_mouse_down(d_mouse m);
 bool d_app_key_down(d_key k);
-bool d_app_key_mod(d_kmod kmod);
+bool d_app_key_mod(d_keymod kmod);
 d_vec2 d_app_mouse_pos(void);
 d_vec2 d_app_mouse_dpos(void);
 d_vec2 d_app_touch_pos(d_touch t);
@@ -2287,15 +2287,15 @@ bool d_app_key_released(d_key k) {
 	return d_app.key_states[k] == D_BTN_RELEASED;
 }
 
-bool d_app_key_mod(d_kmod kmod) {
+bool d_app_key_mod(d_keymod kmod) {
 	switch (kmod) {
-		case D_KMOD_ALT:
+		case D_KEYMOD_ALT:
 			return d_app_key_down(D_KEY_LALT) || d_app_key_down(D_KEY_RALT);
-		case D_KMOD_META:
+		case D_KEYMOD_META:
 			return d_app_key_down(D_KEY_LMETA) || d_app_key_down(D_KEY_RMETA);
-		case D_KMOD_CTRL:
+		case D_KEYMOD_CTRL:
 			return d_app_key_down(D_KEY_LCTRL) || d_app_key_down(D_KEY_RCTRL);
-		case D_KMOD_SHIFT:
+		case D_KEYMOD_SHIFT:
 			return d_app_key_down(D_KEY_LSHIFT) || d_app_key_down(D_KEY_RSHIFT);
 	}
 	return false;

d_fnt.h

@@ -9,7 +9,6 @@ char*       d_read_text(char* path, size_t* osize);
 uint8_t*    d_read_bytes(char* path, size_t* osize);
 bool        d_write_bytes(char* path, uint8_t* data, size_t size);
 bool        d_write_text(char* path, char* text, size_t size);
-void        d_free_dir(char** list);
 bool        d_is_file(char* path);
 bool        d_is_dir(char* path);
 char*       d_extname(char* path);
@@ -93,9 +92,7 @@ bool d_is_dir(char* path) {
 
 char* d_extname(char* path) {
 	char* dot = strrchr(path, '.');
-	if (!dot) {
-		return NULL;
-	}
+	if (!dot) return NULL;
 	char* buf = malloc(strlen(dot + 1) + 1);
 	strcpy(buf, dot + 1);
 	return buf;