diff --git a/CMakeLists.txt b/CMakeLists.txt index e615d33b8..d0163d371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "") # Global options. if(NOT ANDROID) - option(BUILD_SDL_FRONTEND "Build the SDL frontend" OFF) option(BUILD_NOGUI_FRONTEND "Build the NoGUI frontend" ON) option(BUILD_QT_FRONTEND "Build the Qt frontend" ON) option(ENABLE_DISCORD_PRESENCE "Build with Discord Rich Presence support" ON) @@ -53,10 +52,6 @@ if(USE_WAYLAND) endif() if(ANDROID) - if(BUILD_SDL_FRONTEND) - message(WARNING "Building for Android, disabling SDL frontend") - set(BUILD_SDL_FRONTEND OFF) - endif() if(BUILD_NOGUI_FRONTEND) message(WARNING "Building for Android, disabling NoGUI frontend") set(BUILD_NOGUI_FRONTEND OFF) @@ -105,7 +100,7 @@ endif() # Required libraries. if(NOT ANDROID) - if(NOT WIN32 AND (BUILD_SDL_FRONTEND OR USE_SDL2)) + if(NOT WIN32 AND USE_SDL2) find_package(SDL2 REQUIRED) endif() if(BUILD_QT_FRONTEND) diff --git a/duckstation.sln b/duckstation.sln index e4ee12a20..19d63eb61 100644 --- a/duckstation.sln +++ b/duckstation.sln @@ -59,8 +59,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "dep\libsam EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duckstation-nogui", "src\duckstation-nogui\duckstation-nogui.vcxproj", "{0A172B2E-DC67-49FC-A4C1-975F93C586C4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duckstation-sdl", "src\duckstation-sdl\duckstation-sdl.vcxproj", "{DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcheevos", "dep\rcheevos\rcheevos.vcxproj", "{4BA0A6D4-3AE1-42B2-9347-096FD023FF64}" EndProject Global @@ -719,30 +717,6 @@ Global {0A172B2E-DC67-49FC-A4C1-975F93C586C4}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 {0A172B2E-DC67-49FC-A4C1-975F93C586C4}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32 {0A172B2E-DC67-49FC-A4C1-975F93C586C4}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Debug|ARM64.Build.0 = Debug|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Debug|x64.ActiveCfg = Debug|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Debug|x64.Build.0 = Debug|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Debug|x86.ActiveCfg = Debug|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Debug|x86.Build.0 = Debug|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.DebugFast|ARM64.Build.0 = DebugFast|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.DebugFast|x64.ActiveCfg = DebugFast|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.DebugFast|x64.Build.0 = DebugFast|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.DebugFast|x86.ActiveCfg = DebugFast|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.DebugFast|x86.Build.0 = DebugFast|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Release|ARM64.ActiveCfg = Release|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Release|ARM64.Build.0 = Release|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Release|x64.ActiveCfg = Release|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Release|x64.Build.0 = Release|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Release|x86.ActiveCfg = Release|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.Release|x86.Build.0 = Release|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32 - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32 {4BA0A6D4-3AE1-42B2-9347-096FD023FF64}.Debug|ARM64.ActiveCfg = Debug|ARM64 {4BA0A6D4-3AE1-42B2-9347-096FD023FF64}.Debug|ARM64.Build.0 = Debug|ARM64 {4BA0A6D4-3AE1-42B2-9347-096FD023FF64}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fa17b5214..8417b4adf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,10 +13,6 @@ if(BUILD_NOGUI_FRONTEND) add_subdirectory(duckstation-nogui) endif() -if(BUILD_SDL_FRONTEND) - add_subdirectory(duckstation-sdl) -endif() - if(BUILD_QT_FRONTEND) add_subdirectory(duckstation-qt) endif() diff --git a/src/duckstation-sdl/CMakeLists.txt b/src/duckstation-sdl/CMakeLists.txt deleted file mode 100644 index 31f137b87..000000000 --- a/src/duckstation-sdl/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -add_executable(duckstation-sdl - main.cpp -) - -if(WIN32) - target_sources(duckstation-sdl PRIVATE - duckstation-sdl.manifest - ) - - # We want a Windows subsystem application not console. - set_target_properties(duckstation-sdl PROPERTIES - WIN32_EXECUTABLE TRUE - DEBUG_POSTFIX "-debug") -endif() - diff --git a/src/duckstation-sdl/duckstation-sdl.aps b/src/duckstation-sdl/duckstation-sdl.aps deleted file mode 100644 index 147191914..000000000 Binary files a/src/duckstation-sdl/duckstation-sdl.aps and /dev/null differ diff --git a/src/duckstation-sdl/duckstation-sdl.ico b/src/duckstation-sdl/duckstation-sdl.ico deleted file mode 100644 index f95b67991..000000000 Binary files a/src/duckstation-sdl/duckstation-sdl.ico and /dev/null differ diff --git a/src/duckstation-sdl/duckstation-sdl.manifest b/src/duckstation-sdl/duckstation-sdl.manifest deleted file mode 100644 index 6bbce6d9b..000000000 --- a/src/duckstation-sdl/duckstation-sdl.manifest +++ /dev/null @@ -1,17 +0,0 @@ - - - - - PerMonitorV2 - true - - - - - - - - - - - \ No newline at end of file diff --git a/src/duckstation-sdl/duckstation-sdl.rc b/src/duckstation-sdl/duckstation-sdl.rc deleted file mode 100644 index 75558ebd2..000000000 --- a/src/duckstation-sdl/duckstation-sdl.rc +++ /dev/null @@ -1,110 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (Australia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS -#pragma code_page(1252) - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "0c0904b0" - BEGIN - VALUE "CompanyName", "https://github.com/stenzek/duckstation" - VALUE "FileDescription", "DuckStation PS1 Emulator" - VALUE "FileVersion", "1.0.0.1" - VALUE "InternalName", "duckstation-sdl.exe" - VALUE "LegalCopyright", "Copyright (C) 2020 Stenzek and collaborators" - VALUE "OriginalFilename", "duckstation-sdl.exe" - VALUE "ProductName", "DuckStation SDL Frontend" - VALUE "ProductVersion", "1.0.0.1" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0xc09, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "duckstation-sdl.ico" - -#endif // English (Australia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/duckstation-sdl/duckstation-sdl.vcxproj b/src/duckstation-sdl/duckstation-sdl.vcxproj deleted file mode 100644 index 40699f49d..000000000 --- a/src/duckstation-sdl/duckstation-sdl.vcxproj +++ /dev/null @@ -1,547 +0,0 @@ - - - - - DebugFast - ARM64 - - - DebugFast - Win32 - - - DebugFast - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - ReleaseLTCG - ARM64 - - - ReleaseLTCG - Win32 - - - ReleaseLTCG - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9} - Win32Proj - duckstation-sdl - 10.0 - - - - Application - true - v142 - NotSet - - - Application - true - v142 - NotSet - - - Application - true - v142 - NotSet - - - Application - true - v142 - NotSet - - - Application - true - v142 - NotSet - - - Application - true - v142 - NotSet - - - Application - false - v142 - true - NotSet - false - - - Application - false - v142 - true - NotSet - false - - - Application - false - v142 - true - NotSet - false - - - Application - false - v142 - true - NotSet - false - - - Application - false - v142 - true - NotSet - false - - - Application - false - v142 - true - NotSet - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)bin\$(Platform)\ - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - true - $(SolutionDir)bin\$(Platform)\ - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - true - $(SolutionDir)bin\$(Platform)\ - - - true - $(SolutionDir)bin\$(Platform)\ - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - true - $(SolutionDir)bin\$(Platform)\ - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - true - $(SolutionDir)bin\$(Platform)\ - - - $(SolutionDir)bin\$(Platform)\ - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - - - false - $(SolutionDir)bin\$(Platform)\ - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - $(SolutionDir)bin\$(Platform)\ - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - $(SolutionDir)bin\$(Platform)\ - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - false - $(SolutionDir)bin\$(Platform)\ - - - $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ - $(ProjectName)-$(Platform)-$(Configuration) - false - $(SolutionDir)bin\$(Platform)\ - - - - - - Level4 - Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - - - - - - - Level4 - Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - - - - - - - Level4 - Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - - - - - - - Level4 - Disabled - _ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - $(SolutionDir)src;%(AdditionalIncludeDirectories) - Default - true - false - stdcpp17 - false - OnlyExplicitInline - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - - - - - - - Level4 - Disabled - _ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - $(SolutionDir)src;%(AdditionalIncludeDirectories) - Default - true - false - stdcpp17 - false - OnlyExplicitInline - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - - - - - - - Level4 - Disabled - _ITERATOR_DEBUG_LEVEL=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUGFAST;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - $(SolutionDir)src;%(AdditionalIncludeDirectories) - Default - true - false - stdcpp17 - false - OnlyExplicitInline - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - - - - - Level4 - - - MaxSpeed - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - Default - - - - - Level4 - - - MaxSpeed - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - true - stdcpp17 - true - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - UseLinkTimeCodeGeneration - - - - - Level4 - - - MaxSpeed - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - Default - - - - - Level4 - - - MaxSpeed - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - Default - - - - - Level4 - - - MaxSpeed - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - true - stdcpp17 - true - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - UseLinkTimeCodeGeneration - - - - - Level4 - - - MaxSpeed - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - $(SolutionDir)src;%(AdditionalIncludeDirectories) - true - true - stdcpp17 - true - true - /Zo /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - UseLinkTimeCodeGeneration - - - - - - \ No newline at end of file diff --git a/src/duckstation-sdl/duckstation-sdl.vcxproj.filters b/src/duckstation-sdl/duckstation-sdl.vcxproj.filters deleted file mode 100644 index 25355ee58..000000000 --- a/src/duckstation-sdl/duckstation-sdl.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/duckstation-sdl/main.cpp b/src/duckstation-sdl/main.cpp deleted file mode 100644 index 66b7830ae..000000000 --- a/src/duckstation-sdl/main.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#ifdef _WIN32 -#include "common/windows_headers.h" -#endif - -#include -#include - -static const char message[] = "The DuckStation SDL frontend has been removed and replaced with the Fullscreen UI.\n\n" - "Please use duckstation-qt instead."; - -#ifdef _WIN32 - -int WinMain(HINSTANCE, HINSTANCE, LPSTR, int) -{ - MessageBoxA(nullptr, message, "DuckStation", MB_OK | MB_ICONERROR); - return -1; -} - -#else - -int main(int argc, char* argv[]) -{ - std::fputs(message, stderr); - return -1; -} - -#endif diff --git a/src/duckstation-sdl/resource.h b/src/duckstation-sdl/resource.h deleted file mode 100644 index 966189314..000000000 --- a/src/duckstation-sdl/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by duckstation-sdl.rc -// -#define IDI_ICON1 102 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 103 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif