diff --git a/pcsx2-gsrunner/Main.cpp b/pcsx2-gsrunner/Main.cpp index 5bfc57be4e..2347bd3696 100644 --- a/pcsx2-gsrunner/Main.cpp +++ b/pcsx2-gsrunner/Main.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -59,7 +60,6 @@ namespace GSRunner { static bool InitializeConfig(); - static bool SetCriticalFolders(); static bool CreatePlatformWindow(); static void DestroyPlatformWindow(); @@ -80,26 +80,6 @@ static std::optional s_use_window; // Owned by the GS thread. static u32 s_dump_frame_number = 0; -bool GSRunner::SetCriticalFolders() -{ - EmuFolders::AppRoot = Path::Canonicalize(Path::GetDirectory(FileSystem::GetProgramPath())); - EmuFolders::Resources = Path::Combine(EmuFolders::AppRoot, "resources"); - EmuFolders::DataRoot = EmuFolders::AppRoot; - - // allow SetDataDirectory() to change settings directory (if we want to split config later on) - if (EmuFolders::Settings.empty()) - EmuFolders::Settings = Path::Combine(EmuFolders::DataRoot, "inis"); - - // the resources directory should exist, bail out if not - if (!FileSystem::DirectoryExists(EmuFolders::Resources.c_str())) - { - Console.Error("Resources directory is missing, your installation is incomplete."); - return false; - } - - return true; -} - bool GSRunner::InitializeConfig() { if (!CommonHost::InitializeCriticalFolders()) @@ -629,24 +609,24 @@ int main(int argc, char* argv[]) if (!GSRunner::InitializeConfig()) { Console.Error("Failed to initialize config."); - return false; + return EXIT_FAILURE; } VMBootParameters params; if (!ParseCommandLineArgs(argc, argv, params)) - return false; + return EXIT_FAILURE; PerformanceMetrics::SetCPUThread(Threading::ThreadHandle::GetForCallingThread()); if (!VMManager::Internal::InitializeGlobals() || !VMManager::Internal::InitializeMemory()) { Console.Error("Failed to allocate globals/memory."); - return false; + return EXIT_FAILURE; } if (s_use_window.value_or(false) && !GSRunner::CreatePlatformWindow()) { Console.Error("Failed to create window."); - return false; + return EXIT_FAILURE; } // apply new settings (e.g. pick up renderer change) diff --git a/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj b/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj index 3d70501906..64cc51939d 100644 --- a/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj +++ b/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj @@ -36,7 +36,6 @@ $(SolutionDir)3rdparty\xbyak;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\freetype\include;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\xz\xz\src\liblzma\api;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\baseclasses;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\libpng;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\glad\include;%(AdditionalIncludeDirectories) @@ -74,9 +73,6 @@ - - {27f17499-a372-4408-8afa-4f9f4584fbd3} - {449ad25e-424a-4714-babc-68706cdcc33b} @@ -120,4 +116,4 @@ - \ No newline at end of file +