Merge pull request #5105 from treloret/master

HX DOS build breaks because of reference to _fseeki64/_ftelli64, remove duplicate dr_flac.h
joncampbell123 · Jul 8, 2024 · 42f4bf1 · 42f4bf1
2 parents e8d5147 + db45efe
commit 42f4bf1
Show file tree

Hide file tree

Showing 7 changed files with 329 additions and 12,657 deletions.
diff --git a/src/dos/cdrom_image.cpp b/src/dos/cdrom_image.cpp
@@ -54,8 +54,8 @@
 #include "src/libs/decoders/wav.c"
 #include "src/libs/decoders/mp3_seek_table.cpp"
 #include "src/libs/decoders/mp3.cpp"
+#include "src/libs/decoders/dr_flac.h"
 #include "src/libs/libchdr/chd.h"
-#include "src/libs/libchdr/dr_flac.h"
 #include "src/libs/libchdr/libchdr_chd.c"
 #include "src/libs/libchdr/libchdr_cdrom.c"
 #include "src/libs/libchdr/libchdr_flac.c"