mv util src;

CMakeLists.txt

@@ -341,13 +341,12 @@ endforeach()
 set(LOVR_SRC
   src/core/fs.c
   src/core/map.c
-  src/core/util.c
   src/core/zip.c
   src/api/api.c
   src/api/l_lovr.c
+  src/util.c
 )
 
-
 if(LOVR_BUILD_EXE AND NOT LOVR_USE_PICO)
   list(APPEND LOVR_SRC src/main.c)
 endif()

Tupfile.lua

@@ -386,8 +386,8 @@ end
 
 src = {
   'src/main.c',
+  'src/util.c',
   'src/core/os_' .. target .. '.c',
-  'src/core/util.c',
   'src/core/fs.c',
   'src/core/map.c',
   'src/core/zip.c',

src/api/api.c

@@ -1,5 +1,5 @@
 #include "api.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <stdlib.h>

src/api/l_audio.c

@@ -3,7 +3,7 @@
 #include "data/blob.h"
 #include "data/sound.h"
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <stdlib.h>

src/api/l_audio_source.c

@@ -1,7 +1,7 @@
 #include "api.h"
 #include "audio/audio.h"
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_data_blob.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "data/blob.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_data_rasterizer.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "data/rasterizer.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_data_sound.c

@@ -1,7 +1,7 @@
 #include "api.h"
 #include "data/sound.h"
 #include "data/blob.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_event.c

@@ -1,7 +1,7 @@
 #include "api.h"
 #include "event/event.h"
 #include "thread/thread.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <stdlib.h>

src/api/l_filesystem.c

@@ -1,7 +1,7 @@
 #include "api.h"
 #include "filesystem/filesystem.h"
 #include "data/blob.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <stdlib.h>

src/api/l_graphics.c

@@ -11,7 +11,7 @@
 #include "data/rasterizer.h"
 #include "data/image.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <math.h>

src/api/l_graphics_font.c

@@ -1,7 +1,7 @@
 #include "api.h"
 #include "graphics/font.h"
 #include "data/rasterizer.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_lovr.c

@@ -1,5 +1,5 @@
 #include "api.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_math.c

@@ -3,7 +3,7 @@
 #include "math/curve.h"
 #include "math/pool.h"
 #include "math/randomGenerator.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <stdlib.h>

src/api/l_math_curve.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "math/curve.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_math_randomGenerator.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "math/randomGenerator.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <math.h>

src/api/l_math_vectors.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_physics.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "physics/physics.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_physics_joints.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "physics/physics.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_physics_shapes.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "physics/physics.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/api/l_physics_world.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "physics/physics.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <stdbool.h>

src/api/l_thread.c

@@ -2,7 +2,7 @@
 #include "event/event.h"
 #include "thread/thread.h"
 #include "thread/channel.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>

src/api/l_thread_channel.c

@@ -1,7 +1,7 @@
 #include "api.h"
 #include "thread/channel.h"
 #include "event/event.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <math.h>

src/api/l_thread_thread.c

@@ -1,6 +1,6 @@
 #include "api.h"
 #include "thread/thread.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 

src/main.c

@@ -2,7 +2,7 @@
 #include "api/api.h"
 #include "event/event.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>

src/modules/audio/audio.c

@@ -2,7 +2,7 @@
 #include "audio/spatializer.h"
 #include "data/sound.h"
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include "lib/miniaudio/miniaudio.h"
 #include <string.h>
 #include <stdlib.h>

src/modules/audio/spatializer_oculus.c

@@ -1,6 +1,6 @@
 #include "spatializer.h"
 #include "audio/audio.h"
-#include "core/util.h"
+#include "util.h"
 #include "lib/miniaudio/miniaudio.h"
 #include <stdlib.h>
 #include <string.h>

src/modules/audio/spatializer_simple.c

@@ -1,6 +1,6 @@
 #include "spatializer.h"
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include <math.h>
 
 static struct {

src/modules/data/blob.c

@@ -1,5 +1,5 @@
 #include "data/blob.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 
 Blob* lovrBlobCreate(void* data, size_t size, const char* name) {

src/modules/data/image.h

@@ -1,4 +1,4 @@
-#include "core/util.h"
+#include "util.h"
 #include <stdint.h>
 #include <stdbool.h>
 

src/modules/data/modelData.h

@@ -1,5 +1,5 @@
 #include "core/map.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>

src/modules/data/modelData_obj.c

@@ -3,7 +3,7 @@
 #include "data/image.h"
 #include "core/maf.h"
 #include "core/map.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <float.h>
 #include <ctype.h>

src/modules/data/modelData_stl.c

@@ -1,7 +1,7 @@
 #include "data/modelData.h"
 #include "data/blob.h"
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <string.h>
 

src/modules/data/rasterizer.c

@@ -2,7 +2,7 @@
 #include "data/blob.h"
 #include "data/image.h"
 #include "resources/VarelaRound.ttf.h"
-#include "core/util.h"
+#include "util.h"
 #include "lib/stb/stb_truetype.h"
 #include <msdfgen-c.h>
 #include <stdlib.h>

src/modules/data/sound.c

@@ -1,6 +1,6 @@
 #include "data/sound.h"
 #include "data/blob.h"
-#include "core/util.h"
+#include "util.h"
 #include "lib/stb/stb_vorbis.h"
 #include "lib/miniaudio/miniaudio.h"
 #define MINIMP3_FLOAT_OUTPUT

src/modules/event/event.c

@@ -1,7 +1,7 @@
 #include "event/event.h"
 #include "thread/thread.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <string.h>
 

src/modules/filesystem/file.c

@@ -1,6 +1,6 @@
 #include "filesystem/file.h"
 #include "filesystem/filesystem.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <string.h>
 

src/modules/filesystem/filesystem.c

@@ -2,7 +2,7 @@
 #include "core/fs.h"
 #include "core/map.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include "core/zip.h"
 #include "lib/stb/stb_image.h"
 #include <string.h>

src/modules/graphics/graphics.c

@@ -10,7 +10,7 @@
 #include "math/math.h"
 #include "core/maf.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>

src/modules/graphics/material.c

@@ -3,7 +3,7 @@
 #include "graphics/shader.h"
 #include "graphics/texture.h"
 #include "resources/shaders.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <math.h>
 

src/modules/graphics/shader.h

@@ -1,5 +1,5 @@
 #include "graphics/texture.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdbool.h>
 
 #pragma once

src/modules/headset/headset.c

@@ -1,5 +1,5 @@
 #include "headset/headset.h"
-#include "core/util.h"
+#include "util.h"
 
 HeadsetInterface* lovrHeadsetDisplayDriver = NULL;
 HeadsetInterface* lovrHeadsetTrackingDrivers = NULL;

src/modules/headset/headset_desktop.c

@@ -3,7 +3,7 @@
 #include "graphics/graphics.h"
 #include "core/maf.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <math.h>
 #include <stdint.h>
 #include <stdbool.h>

src/modules/headset/headset_openxr.c

@@ -6,7 +6,7 @@
 #include "graphics/model.h"
 #include "graphics/texture.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <math.h>
 

src/modules/headset/headset_pico.c

@@ -6,7 +6,7 @@
 #include "api/api.h"
 #include "core/maf.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>

src/modules/math/curve.c

@@ -1,6 +1,6 @@
 #include "math/curve.h"
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <math.h>
 

src/modules/math/math.c

@@ -1,6 +1,6 @@
 #include "math.h"
 #include "math/randomGenerator.h"
-#include "core/util.h"
+#include "util.h"
 #include "lib/noise1234/noise1234.h"
 #include <math.h>
 #include <string.h>

src/modules/math/pool.c

@@ -1,5 +1,5 @@
 #include "math/pool.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 
 static const size_t vectorComponents[] = {

src/modules/math/randomGenerator.c

@@ -1,5 +1,5 @@
 #include "math/randomGenerator.h"
-#include "core/util.h"
+#include "util.h"
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>

src/modules/physics/physics.c

@@ -1,5 +1,5 @@
 #include "physics.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <stdbool.h>
 

src/modules/physics/physics.h

@@ -1,5 +1,5 @@
 #include "core/maf.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include <ode/ode.h>

src/modules/system/system.c

@@ -1,7 +1,7 @@
 #include "system/system.h"
 #include "event/event.h"
 #include "core/os.h"
-#include "core/util.h"
+#include "util.h"
 #include <string.h>
 
 static void onKeyboardEvent(os_button_action action, os_key key, uint32_t scancode, bool repeat) {

src/modules/thread/channel.c

@@ -1,6 +1,6 @@
 #include "thread/channel.h"
 #include "event/event.h"
-#include "core/util.h"
+#include "util.h"
 #include "lib/tinycthread/tinycthread.h"
 #include <stdlib.h>
 #include <stddef.h>

src/modules/thread/thread.c

@@ -1,7 +1,7 @@
 #include "thread/thread.h"
 #include "thread/channel.h"
 #include "core/map.h"
-#include "core/util.h"
+#include "util.h"
 #include <stdlib.h>
 #include <string.h>