Skip to content
This repository was archived by the owner on Dec 6, 2025. It is now read-only.

Commit 5bd7a75

Browse files
committed
Simplify config and add SDL build options
Added `Release|x64` build configuration in `PCSX2_qt.sln`. Updated `pcsx2-winrt.vcxproj` and `pcsx2.vcxproj` to include `/D SDL_BUILD` compiler option. Simplified `InputBindingKey` initialization in `SDLInputSource.cpp`.
1 parent 0065392 commit 5bd7a75

File tree

5 files changed

+7
-29
lines changed

5 files changed

+7
-29
lines changed

PCSX2_qt.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,6 +2025,7 @@ Global
20252025
{BB98BF81-A132-444A-BB81-96D510F433A8}.Release|ARM64.ActiveCfg = Release|x64
20262026
{BB98BF81-A132-444A-BB81-96D510F433A8}.Release|ARM64.Build.0 = Release|x64
20272027
{BB98BF81-A132-444A-BB81-96D510F433A8}.Release|x64.ActiveCfg = Release|x64
2028+
{BB98BF81-A132-444A-BB81-96D510F433A8}.Release|x64.Build.0 = Release|x64
20282029
{BB98BF81-A132-444A-BB81-96D510F433A8}.Release|x86.ActiveCfg = Release|x64
20292030
{BB98BF81-A132-444A-BB81-96D510F433A8}.Release|x86.Build.0 = Release|x64
20302031
{67D0160C-0FE4-44B9-AC2E-82BBCF4104DF}.Debug AVX2|ARM.ActiveCfg = Devel Clang|x64

pcsx2-winrt/pcsx2-winrt.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<FloatingPointModel>Precise</FloatingPointModel>
108108
<MultiProcessorCompilation>true</MultiProcessorCompilation>
109109
<ConformanceMode>true</ConformanceMode>
110-
<AdditionalOptions>/Zc:__cplusplus /Zo /utf-8%(AdditionalOptions) /bigobj</AdditionalOptions>
110+
<AdditionalOptions>/Zc:__cplusplus /Zo /utf-8%(AdditionalOptions) /bigobj /D SDL_BUILD</AdditionalOptions>
111111
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Clang|ARM64'">Full</Optimization>
112112
<FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug Clang|ARM64'">Speed</FavorSizeOrSpeed>
113113
</ClCompile>

pcsx2/Input/SDLInputSource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ bool SDLInputSource::CloseDevice(int joystick_index)
799799
return false;
800800

801801
InputManager::OnInputDeviceDisconnected(
802-
{InputBindingKey{.source_type = InputSourceType::SDL, .source_index = static_cast<u32>(it->player_id)}},
802+
{InputBindingKey{InputSourceType::SDL, static_cast<u32>(it->player_id)}},
803803
fmt::format("SDL-{}", it->player_id));
804804

805805
if (it->haptic)

pcsx2/Pcsx2Config.cpp

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,6 @@ void Pcsx2Config::CopyRuntimeConfig(Pcsx2Config& cfg)
20392039
CurrentIRX = std::move(cfg.CurrentIRX);
20402040
CurrentGameArgs = std::move(cfg.CurrentGameArgs);
20412041
CurrentAspectRatio = cfg.CurrentAspectRatio;
2042-
IsPortableMode = cfg.IsPortableMode;
20432042

20442043
for (u32 i = 0; i < sizeof(Mcd) / sizeof(Mcd[0]); i++)
20452044
{
@@ -2125,15 +2124,8 @@ bool EmuFolders::SetResourcesDirectory()
21252124

21262125
bool EmuFolders::ShouldUsePortableMode()
21272126
{
2128-
// Check whether portable.ini/txt exists in the program directory or the `-portable` launch arguments have been passed.
2129-
if (FileSystem::FileExists(Path::Combine(AppRoot, "portable.ini").c_str()) ||
2130-
FileSystem::FileExists(Path::Combine(AppRoot, "portable.txt").c_str()) ||
2131-
EmuConfig.IsPortableMode)
2132-
{
2133-
return true;
2134-
}
2135-
2136-
return false;
2127+
// Check whether portable.ini exists in the program directory.
2128+
return FileSystem::FileExists(Path::Combine(AppRoot, "portable.ini").c_str()) || FileSystem::FileExists(Path::Combine(AppRoot, "portable.txt").c_str());
21372129
}
21382130

21392131
bool EmuFolders::SetDataDirectory(Error* error)
@@ -2186,23 +2178,7 @@ bool EmuFolders::SetDataDirectory(Error* error)
21862178

21872179
// couldn't determine the data directory, or using portable mode? fallback to portable.
21882180
if (DataRoot.empty())
2189-
{
2190-
/* This breaks bulding on UWP so we have to comment this out
2191-
#if defined(__linux__)
2192-
// special check if we're on appimage
2193-
// always make sure that DataRoot
2194-
// is adjacent next to the appimage
2195-
if (getenv("APPIMAGE"))
2196-
{
2197-
std::string_view appimage_path = Path::GetDirectory(getenv("APPIMAGE"));
2198-
DataRoot = Path::RealPath(Path::Combine(appimage_path, "PCSX2"));
2199-
}
2200-
else
2201-
DataRoot = Path::Combine(AppRoot, GetPortableModePath());
2202-
#else
2203-
DataRoot = Path::Combine(AppRoot, GetPortableModePath());
2204-
#endif
2205-
} */
2181+
DataRoot = AppRoot;
22062182

22072183
// inis is always below the data root
22082184
Settings = Path::Combine(DataRoot, "inis");

pcsx2/pcsx2.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<PreprocessorDefinitions>__SSE4_1__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7878
<PreprocessorDefinitions Condition="'$(Platform)'=='x64'">ZYCORE_STATIC_DEFINE;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
80+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/D SDL_BUILD %(AdditionalOptions)</AdditionalOptions>
8081
</ClCompile>
8182
</ItemDefinitionGroup>
8283
<ItemGroup>

0 commit comments

Comments
 (0)