filesystem: move to libtrx; pull SDL2

LostArtefacts · Apr 29, 2024 · 2f8b0c3 · 2f8b0c3
1 parent bba944c
commit 2f8b0c3
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 424 deletions.
diff --git a/meson.build b/meson.build
@@ -19,6 +19,7 @@ add_project_arguments(build_opts, language: 'c')
 staticdeps = get_option('staticdeps')
 
 null_dep = dependency('', required: false)
+dep_sdl2 = dependency('SDL2', static: staticdeps)
 dep_mathlibrary = c_compiler.find_library('m', static: staticdeps, required : false)
 
 # autogenerated files
@@ -72,7 +73,6 @@ exe_sources = [
 dll_sources = [
   init,
   'src/decomp/decomp.c',
-  'src/filesystem.c',
   'src/game/box.c',
   'src/game/camera.c',
   'src/game/console.c',
@@ -107,7 +107,6 @@ dll_sources = [
   'src/lib/winmm.c',
   'src/main_dll.c',
   'src/specific/s_audio_sample.c',
-  'src/specific/s_filesystem.c',
   'src/specific/s_flagged_string.c',
   'src/specific/s_input.c',
   'src/specific/s_music_mm.c',
@@ -116,6 +115,7 @@ dll_sources = [
 ]
 
 dependencies = [
+  dep_sdl2,
   dep_mathlibrary,
 ]
 

diff --git a/src/filesystem.c b/src/filesystem.c
diff --git a/src/filesystem.h b/src/filesystem.h
diff --git a/src/main_dll.c b/src/main_dll.c
@@ -1,8 +1,9 @@
-#include "filesystem.h"
 #include "inject_exec.h"
 #include "lib/winmm.h"
+#include "shared/filesystem.h"
 #include "shared/log.h"
 
+#include <SDL2/SDL.h>
 #include <stdio.h>
 #include <windows.h>