more lua stuff

Author: slmjkdbtl

Makefile

@@ -43,7 +43,6 @@ CFLAGS += -pedantic
 CFLAGS += -std=c99
 CFLAGS += -I.
 CFLAGS += -Iext
-CFLAGS += -Iext/lua/src
 CFLAGS += -Wno-unused-function
 CFLAGS += -Wno-unused-variable
 CFLAGS += -Wno-missing-braces
@@ -134,7 +133,8 @@ PREFIX := /usr/local
 
 LUA_PATH := ext/lua
 LUA_LIB := lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lauxlib.c lbaselib.c lcorolib.c ldblib.c liolib.c lmathlib.c loadlib.c loslib.c lstrlib.c ltablib.c lutf8lib.c linit.c
-LUA_SRC := $(addprefix $(LUA_PATH)/src/, $(LUA_LIB))
+LUA_SRC := $(addprefix $(LUA_PATH)/src/, $(LUA_LIB)) ext/stb_vorbis.c
+LUA_CFLAGS += -I$(LUA_PATH)/src
 LUA_CFLAGS += -Wno-gnu-label-as-value
 LUA_CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
 
@@ -227,6 +227,10 @@ $(BIN_PATH)/dirty: dirty.c *.h
 runlua: $(BIN_PATH)/dlua
 	$< $(ARGS)
 
+.PHONY: install
+installlua: $(BIN_PATH)/dlua
+	install $< $(PREFIX)/bin/dlua
+
 .PHONY: runscript
 runscript: $(BIN_PATH)/dirty
 	$< $(ARGS)

d_audio.h

@@ -453,11 +453,11 @@ static short *resample(
 	return output;
 }
 
-static uint8_t ogg_sig[] = { 0x4f, 0x67, 0x67, 0x53 };
-static uint8_t wav_sig[] = { 0x52, 0x49, 0x46, 0x46 };
+static uint8_t OGG_SIG[] = { 0x4f, 0x67, 0x67, 0x53 };
+static uint8_t WAV_SIG[] = { 0x52, 0x49, 0x46, 0x46 };
 
 d_sound d_sound_parse(uint8_t* bytes, size_t size) {
-	if (memcmp(bytes, ogg_sig, sizeof(ogg_sig)) == 0) {
+	if (memcmp(bytes, OGG_SIG, sizeof(OGG_SIG)) == 0) {
 #ifdef STB_VORBIS_IMPLEMENTATION
 		d_sound snd = d_sound_empty();
 		int num_channels, sample_rate;

d_gfx.h

@@ -1916,5 +1916,16 @@ d_model d_model_load(char* path) {
 #endif // #ifdef D_FS_H
 #endif // #ifdef CGLTF_IMPLEMENTATION
 
+void d_model_free(d_model* model) {
+	for (int i = 0; i < model->num_images; i++) {
+		d_img_free(&model->images[i]);
+	}
+	free(model->images);
+	for (int i = 0; i < model->num_nodes; i++) {
+		d_free_model_node(&model->nodes[i]);
+	}
+	free(model->nodes);
+}
+
 #endif // #ifndef D_GFX_IMPL_ONCE
 #endif // #ifdef D_GFX_IMPL