diff --git a/CMakeLists.txt b/CMakeLists.txt index 98b3e979..0c062d72 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/Tupfile.lua b/Tupfile.lua index 6b8968e9..577a02f8 100644 --- a/Tupfile.lua +++ b/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', diff --git a/src/api/api.c b/src/api/api.c index 36df4744..e5e4a2bb 100644 --- a/src/api/api.c +++ b/src/api/api.c @@ -1,5 +1,5 @@ #include "api.h" -#include "core/util.h" +#include "util.h" #include #include #include diff --git a/src/api/l_audio.c b/src/api/l_audio.c index c227145c..d573e076 100644 --- a/src/api/l_audio.c +++ b/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 #include #include diff --git a/src/api/l_audio_source.c b/src/api/l_audio_source.c index a575c030..90b959c4 100644 --- a/src/api/l_audio_source.c +++ b/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 #include diff --git a/src/api/l_data_blob.c b/src/api/l_data_blob.c index c9757e73..c12f3332 100644 --- a/src/api/l_data_blob.c +++ b/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 #include diff --git a/src/api/l_data_rasterizer.c b/src/api/l_data_rasterizer.c index 62abf95f..af10c2ea 100644 --- a/src/api/l_data_rasterizer.c +++ b/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 #include diff --git a/src/api/l_data_sound.c b/src/api/l_data_sound.c index a958b78a..565af22f 100644 --- a/src/api/l_data_sound.c +++ b/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 #include diff --git a/src/api/l_event.c b/src/api/l_event.c index 9159b580..56af7350 100644 --- a/src/api/l_event.c +++ b/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 #include #include diff --git a/src/api/l_filesystem.c b/src/api/l_filesystem.c index d3f5cc4f..1ad09ca2 100644 --- a/src/api/l_filesystem.c +++ b/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 #include #include diff --git a/src/api/l_graphics.c b/src/api/l_graphics.c index 06f9cda4..0957dc57 100644 --- a/src/api/l_graphics.c +++ b/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 #include #include diff --git a/src/api/l_graphics_font.c b/src/api/l_graphics_font.c index 968fa2bc..42cc4f0f 100644 --- a/src/api/l_graphics_font.c +++ b/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 #include diff --git a/src/api/l_lovr.c b/src/api/l_lovr.c index 62b910a2..9966f404 100644 --- a/src/api/l_lovr.c +++ b/src/api/l_lovr.c @@ -1,5 +1,5 @@ #include "api.h" -#include "core/util.h" +#include "util.h" #include #include diff --git a/src/api/l_math.c b/src/api/l_math.c index d436d700..c9957f26 100644 --- a/src/api/l_math.c +++ b/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 #include #include diff --git a/src/api/l_math_curve.c b/src/api/l_math_curve.c index 7351fb02..89b26360 100644 --- a/src/api/l_math_curve.c +++ b/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 #include diff --git a/src/api/l_math_randomGenerator.c b/src/api/l_math_randomGenerator.c index 67a8c592..9903bebc 100644 --- a/src/api/l_math_randomGenerator.c +++ b/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 #include #include diff --git a/src/api/l_math_vectors.c b/src/api/l_math_vectors.c index 3a58125c..e1168953 100644 --- a/src/api/l_math_vectors.c +++ b/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 #include diff --git a/src/api/l_physics.c b/src/api/l_physics.c index 5e6f1cd9..a3750b79 100644 --- a/src/api/l_physics.c +++ b/src/api/l_physics.c @@ -1,6 +1,6 @@ #include "api.h" #include "physics/physics.h" -#include "core/util.h" +#include "util.h" #include #include diff --git a/src/api/l_physics_joints.c b/src/api/l_physics_joints.c index fc530b88..e201db9c 100644 --- a/src/api/l_physics_joints.c +++ b/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 #include diff --git a/src/api/l_physics_shapes.c b/src/api/l_physics_shapes.c index 10ac4173..8cc1f89a 100644 --- a/src/api/l_physics_shapes.c +++ b/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 #include diff --git a/src/api/l_physics_world.c b/src/api/l_physics_world.c index 542094e0..fb580c99 100644 --- a/src/api/l_physics_world.c +++ b/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 #include #include diff --git a/src/api/l_thread.c b/src/api/l_thread.c index 4dd54ae4..24549d33 100644 --- a/src/api/l_thread.c +++ b/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 #include #include diff --git a/src/api/l_thread_channel.c b/src/api/l_thread_channel.c index abe2a1ee..9bdd4667 100644 --- a/src/api/l_thread_channel.c +++ b/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 #include #include diff --git a/src/api/l_thread_thread.c b/src/api/l_thread_thread.c index b827465d..0d8576ee 100644 --- a/src/api/l_thread_thread.c +++ b/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 #include diff --git a/src/main.c b/src/main.c index def57d5d..dd3f99c1 100644 --- a/src/main.c +++ b/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 #include #include diff --git a/src/modules/audio/audio.c b/src/modules/audio/audio.c index 0594a9cd..aec0d88f 100644 --- a/src/modules/audio/audio.c +++ b/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 #include diff --git a/src/modules/audio/spatializer_oculus.c b/src/modules/audio/spatializer_oculus.c index 03747a55..fdaa4e92 100644 --- a/src/modules/audio/spatializer_oculus.c +++ b/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 #include diff --git a/src/modules/audio/spatializer_simple.c b/src/modules/audio/spatializer_simple.c index 59ab81dc..d3f1649f 100644 --- a/src/modules/audio/spatializer_simple.c +++ b/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 static struct { diff --git a/src/modules/data/blob.c b/src/modules/data/blob.c index 7c56414c..8fb8feec 100644 --- a/src/modules/data/blob.c +++ b/src/modules/data/blob.c @@ -1,5 +1,5 @@ #include "data/blob.h" -#include "core/util.h" +#include "util.h" #include Blob* lovrBlobCreate(void* data, size_t size, const char* name) { diff --git a/src/modules/data/image.h b/src/modules/data/image.h index c7c75bca..4689cb29 100644 --- a/src/modules/data/image.h +++ b/src/modules/data/image.h @@ -1,4 +1,4 @@ -#include "core/util.h" +#include "util.h" #include #include diff --git a/src/modules/data/modelData.h b/src/modules/data/modelData.h index a0c718b1..71a3a7fb 100644 --- a/src/modules/data/modelData.h +++ b/src/modules/data/modelData.h @@ -1,5 +1,5 @@ #include "core/map.h" -#include "core/util.h" +#include "util.h" #include #include #include diff --git a/src/modules/data/modelData_obj.c b/src/modules/data/modelData_obj.c index 3d861a84..97f957c9 100644 --- a/src/modules/data/modelData_obj.c +++ b/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 #include #include diff --git a/src/modules/data/modelData_stl.c b/src/modules/data/modelData_stl.c index 9b613de4..9d95b8dc 100644 --- a/src/modules/data/modelData_stl.c +++ b/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 #include diff --git a/src/modules/data/rasterizer.c b/src/modules/data/rasterizer.c index c1713cda..e6fb7b15 100644 --- a/src/modules/data/rasterizer.c +++ b/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 #include diff --git a/src/modules/data/sound.c b/src/modules/data/sound.c index 7f56f250..164c833f 100644 --- a/src/modules/data/sound.c +++ b/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 diff --git a/src/modules/event/event.c b/src/modules/event/event.c index 25843157..0a2a6bf4 100644 --- a/src/modules/event/event.c +++ b/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 #include diff --git a/src/modules/filesystem/file.c b/src/modules/filesystem/file.c index 156415bc..07fda6f1 100644 --- a/src/modules/filesystem/file.c +++ b/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 #include diff --git a/src/modules/filesystem/filesystem.c b/src/modules/filesystem/filesystem.c index c92d341d..8c93e1a9 100644 --- a/src/modules/filesystem/filesystem.c +++ b/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 diff --git a/src/modules/graphics/graphics.c b/src/modules/graphics/graphics.c index 6a36ebbe..4eef8fc1 100644 --- a/src/modules/graphics/graphics.c +++ b/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 #include #include diff --git a/src/modules/graphics/material.c b/src/modules/graphics/material.c index 3bab4239..953302a4 100644 --- a/src/modules/graphics/material.c +++ b/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 #include diff --git a/src/modules/graphics/shader.h b/src/modules/graphics/shader.h index 8297cdb3..7a05fcba 100644 --- a/src/modules/graphics/shader.h +++ b/src/modules/graphics/shader.h @@ -1,5 +1,5 @@ #include "graphics/texture.h" -#include "core/util.h" +#include "util.h" #include #pragma once diff --git a/src/modules/headset/headset.c b/src/modules/headset/headset.c index 9b6baae6..029f74e1 100644 --- a/src/modules/headset/headset.c +++ b/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; diff --git a/src/modules/headset/headset_desktop.c b/src/modules/headset/headset_desktop.c index 599addd0..1ae044c8 100644 --- a/src/modules/headset/headset_desktop.c +++ b/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 #include #include diff --git a/src/modules/headset/headset_openxr.c b/src/modules/headset/headset_openxr.c index eeb7c982..af55dc83 100644 --- a/src/modules/headset/headset_openxr.c +++ b/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 #include diff --git a/src/modules/headset/headset_pico.c b/src/modules/headset/headset_pico.c index 7eff0a9b..af565c26 100644 --- a/src/modules/headset/headset_pico.c +++ b/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 #include #include diff --git a/src/modules/math/curve.c b/src/modules/math/curve.c index 787565a6..3949b325 100644 --- a/src/modules/math/curve.c +++ b/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 #include diff --git a/src/modules/math/math.c b/src/modules/math/math.c index 7e8560c6..e5e3ac15 100644 --- a/src/modules/math/math.c +++ b/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 #include diff --git a/src/modules/math/pool.c b/src/modules/math/pool.c index accfa20a..05c99d56 100644 --- a/src/modules/math/pool.c +++ b/src/modules/math/pool.c @@ -1,5 +1,5 @@ #include "math/pool.h" -#include "core/util.h" +#include "util.h" #include static const size_t vectorComponents[] = { diff --git a/src/modules/math/randomGenerator.c b/src/modules/math/randomGenerator.c index a30aea7b..0447d969 100644 --- a/src/modules/math/randomGenerator.c +++ b/src/modules/math/randomGenerator.c @@ -1,5 +1,5 @@ #include "math/randomGenerator.h" -#include "core/util.h" +#include "util.h" #include #include #include diff --git a/src/modules/physics/physics.c b/src/modules/physics/physics.c index b0f10ae5..07cd393f 100644 --- a/src/modules/physics/physics.c +++ b/src/modules/physics/physics.c @@ -1,5 +1,5 @@ #include "physics.h" -#include "core/util.h" +#include "util.h" #include #include diff --git a/src/modules/physics/physics.h b/src/modules/physics/physics.h index ec9d4ed3..a86fedc8 100644 --- a/src/modules/physics/physics.h +++ b/src/modules/physics/physics.h @@ -1,5 +1,5 @@ #include "core/maf.h" -#include "core/util.h" +#include "util.h" #include #include #include diff --git a/src/modules/system/system.c b/src/modules/system/system.c index 760a66e2..2757b6af 100644 --- a/src/modules/system/system.c +++ b/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 static void onKeyboardEvent(os_button_action action, os_key key, uint32_t scancode, bool repeat) { diff --git a/src/modules/thread/channel.c b/src/modules/thread/channel.c index 5730ae0f..41d26280 100644 --- a/src/modules/thread/channel.c +++ b/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 #include diff --git a/src/modules/thread/thread.c b/src/modules/thread/thread.c index c48fc47b..1d2607cb 100644 --- a/src/modules/thread/thread.c +++ b/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 #include diff --git a/src/core/util.c b/src/util.c similarity index 100% rename from src/core/util.c rename to src/util.c diff --git a/src/core/util.h b/src/util.h similarity index 100% rename from src/core/util.h rename to src/util.h