summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSonic Dreamcaster <alejandro.asenjo88@gmail.com>2025-05-13 21:59:01 -0300
committerSonic Dreamcaster <alejandro.asenjo88@gmail.com>2025-05-13 21:59:01 -0300
commit2c9bc2738dfd03eaf81e0c9339107f63062f5d99 (patch)
treeeccf718ce2bb6f765237c6fa147634e0b4b7727b /src
parentfe69a3ff835748bb9bf977db3a15d166ff61f968 (diff)
update LUS
Diffstat (limited to 'src')
-rw-r--r--src/port/Engine.cpp5
-rw-r--r--src/port/resource/importers/ResourceUtil.h1
-rw-r--r--src/port/resource/importers/audio/SampleFactory.cpp2
-rw-r--r--src/port/resource/importers/audio/SoundFontFactory.cpp1
4 files changed, 8 insertions, 1 deletions
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index 3ebf88f3..a2c16ca8 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -70,7 +70,12 @@ GameEngine::GameEngine() {
std::vector<std::string> archiveFiles;
const std::string main_path = Ship::Context::GetPathRelativeToAppDirectory("sf64.o2r");
+#ifdef __linux__
const std::string assets_path = Ship::Context::GetPathRelativeToAppBundle("starship.o2r");
+#else
+ const std::string assets_path = Ship::Context::GetPathRelativeToAppDirectory("starship.o2r");
+#endif
+
#ifdef _WIN32
AllocConsole();
diff --git a/src/port/resource/importers/ResourceUtil.h b/src/port/resource/importers/ResourceUtil.h
index 32a6fd4c..67ed936a 100644
--- a/src/port/resource/importers/ResourceUtil.h
+++ b/src/port/resource/importers/ResourceUtil.h
@@ -1,6 +1,7 @@
#pragma once
#include "resourcebridge.h"
+#include "ResourceManager.h"
#include "Context.h"
namespace SF64 {
diff --git a/src/port/resource/importers/audio/SampleFactory.cpp b/src/port/resource/importers/audio/SampleFactory.cpp
index 87f6ec14..d4115cb9 100644
--- a/src/port/resource/importers/audio/SampleFactory.cpp
+++ b/src/port/resource/importers/audio/SampleFactory.cpp
@@ -4,7 +4,7 @@
#include "sf64audio_provisional.h"
#define DR_WAV_IMPLEMENTATION
#include <dr_wav.h>
-
+#include <tinyxml2.h>
#define DR_MP3_IMPLEMENTATION
#include <dr_mp3.h>
diff --git a/src/port/resource/importers/audio/SoundFontFactory.cpp b/src/port/resource/importers/audio/SoundFontFactory.cpp
index 126b43fe..c3d16d0f 100644
--- a/src/port/resource/importers/audio/SoundFontFactory.cpp
+++ b/src/port/resource/importers/audio/SoundFontFactory.cpp
@@ -3,6 +3,7 @@
#include "utils/StringHelper.h"
#include <sf64audio_provisional.h>
#include "port/resource/type/audio/SoundFont.h"
+#include <tinyxml2.h>
namespace SF64 {
std::shared_ptr<Ship::IResource> ResourceFactoryBinarySoundFontV0::ReadResource(std::shared_ptr<Ship::File> file,