diff --git a/duckstation.sln b/duckstation.sln
index c5f912d2d..712bfc9a8 100644
--- a/duckstation.sln
+++ b/duckstation.sln
@@ -13,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{868B98C8-65A1-494B-8346-250A73A48C0A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duckstation", "src\duckstation\duckstation.vcxproj", "{DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stb", "dep\stb\stb.vcxproj", "{ED601289-AC1A-46B8-A8ED-17DB9EB73423}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcue", "dep\libcue\libcue.vcxproj", "{6A4208ED-E3DC-41E1-81CD-F61025FC285A}"
@@ -39,6 +37,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC", "dep\libFLAC\libF
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzma", "dep\lzma\lzma.vcxproj", "{DD944834-7899-4C1C-A4C1-064B5009D239}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duckstation-sdl", "src\duckstation-sdl\duckstation-sdl.vcxproj", "{DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -115,22 +115,6 @@ Global
{868B98C8-65A1-494B-8346-250A73A48C0A}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
{868B98C8-65A1-494B-8346-250A73A48C0A}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32
{868B98C8-65A1-494B-8346-250A73A48C0A}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32
- {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|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|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|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
{ED601289-AC1A-46B8-A8ED-17DB9EB73423}.Debug|x64.ActiveCfg = Debug|x64
{ED601289-AC1A-46B8-A8ED-17DB9EB73423}.Debug|x64.Build.0 = Debug|x64
{ED601289-AC1A-46B8-A8ED-17DB9EB73423}.Debug|x86.ActiveCfg = Debug|Win32
@@ -323,6 +307,22 @@ Global
{DD944834-7899-4C1C-A4C1-064B5009D239}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
{DD944834-7899-4C1C-A4C1-064B5009D239}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32
{DD944834-7899-4C1C-A4C1-064B5009D239}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32
+ {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|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|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|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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66cea8d2e..07e2e299a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(common)
add_subdirectory(core)
if(BUILD_SDL_FRONTEND)
- add_subdirectory(duckstation)
+ add_subdirectory(duckstation-sdl)
endif()
if(BUILD_QT_FRONTEND)
diff --git a/src/duckstation/CMakeLists.txt b/src/duckstation-sdl/CMakeLists.txt
similarity index 59%
rename from src/duckstation/CMakeLists.txt
rename to src/duckstation-sdl/CMakeLists.txt
index c3472d882..ad0389bac 100644
--- a/src/duckstation/CMakeLists.txt
+++ b/src/duckstation-sdl/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_executable(duckstation
+add_executable(duckstation-sdl
icon.cpp
icon.h
imgui_impl_sdl.cpp
@@ -17,11 +17,11 @@ add_executable(duckstation
)
if(WIN32)
- target_sources(duckstation PRIVATE
+ target_sources(duckstation-sdl PRIVATE
d3d11_host_display.cpp
d3d11_host_display.h
)
- target_link_libraries(duckstation PRIVATE d3d11.lib dxgi.lib winmm.lib)
+ target_link_libraries(duckstation-sdl PRIVATE d3d11.lib dxgi.lib winmm.lib)
endif()
-target_link_libraries(duckstation PRIVATE core common imgui nativefiledialog glad simpleini SDL2::Main)
+target_link_libraries(duckstation-sdl PRIVATE core common imgui nativefiledialog glad simpleini SDL2::Main)
diff --git a/src/duckstation/d3d11_host_display.cpp b/src/duckstation-sdl/d3d11_host_display.cpp
similarity index 100%
rename from src/duckstation/d3d11_host_display.cpp
rename to src/duckstation-sdl/d3d11_host_display.cpp
diff --git a/src/duckstation/d3d11_host_display.h b/src/duckstation-sdl/d3d11_host_display.h
similarity index 100%
rename from src/duckstation/d3d11_host_display.h
rename to src/duckstation-sdl/d3d11_host_display.h
diff --git a/src/duckstation/duckstation.vcxproj b/src/duckstation-sdl/duckstation-sdl.vcxproj
similarity index 99%
rename from src/duckstation/duckstation.vcxproj
rename to src/duckstation-sdl/duckstation-sdl.vcxproj
index a44d2d842..07544648c 100644
--- a/src/duckstation/duckstation.vcxproj
+++ b/src/duckstation-sdl/duckstation-sdl.vcxproj
@@ -72,7 +72,7 @@
{DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}
Win32Proj
- duckstation
+ duckstation-sdl
10.0
diff --git a/src/duckstation/duckstation.vcxproj.filters b/src/duckstation-sdl/duckstation-sdl.vcxproj.filters
similarity index 100%
rename from src/duckstation/duckstation.vcxproj.filters
rename to src/duckstation-sdl/duckstation-sdl.vcxproj.filters
diff --git a/src/duckstation/font_roboto_regular.inl b/src/duckstation-sdl/font_roboto_regular.inl
similarity index 100%
rename from src/duckstation/font_roboto_regular.inl
rename to src/duckstation-sdl/font_roboto_regular.inl
diff --git a/src/duckstation/icon.cpp b/src/duckstation-sdl/icon.cpp
similarity index 100%
rename from src/duckstation/icon.cpp
rename to src/duckstation-sdl/icon.cpp
diff --git a/src/duckstation/icon.h b/src/duckstation-sdl/icon.h
similarity index 100%
rename from src/duckstation/icon.h
rename to src/duckstation-sdl/icon.h
diff --git a/src/duckstation/imgui_impl_sdl.cpp b/src/duckstation-sdl/imgui_impl_sdl.cpp
similarity index 100%
rename from src/duckstation/imgui_impl_sdl.cpp
rename to src/duckstation-sdl/imgui_impl_sdl.cpp
diff --git a/src/duckstation/imgui_impl_sdl.h b/src/duckstation-sdl/imgui_impl_sdl.h
similarity index 100%
rename from src/duckstation/imgui_impl_sdl.h
rename to src/duckstation-sdl/imgui_impl_sdl.h
diff --git a/src/duckstation/imgui_styles.cpp b/src/duckstation-sdl/imgui_styles.cpp
similarity index 100%
rename from src/duckstation/imgui_styles.cpp
rename to src/duckstation-sdl/imgui_styles.cpp
diff --git a/src/duckstation/imgui_styles.h b/src/duckstation-sdl/imgui_styles.h
similarity index 100%
rename from src/duckstation/imgui_styles.h
rename to src/duckstation-sdl/imgui_styles.h
diff --git a/src/duckstation/main.cpp b/src/duckstation-sdl/main.cpp
similarity index 100%
rename from src/duckstation/main.cpp
rename to src/duckstation-sdl/main.cpp
diff --git a/src/duckstation/opengl_host_display.cpp b/src/duckstation-sdl/opengl_host_display.cpp
similarity index 100%
rename from src/duckstation/opengl_host_display.cpp
rename to src/duckstation-sdl/opengl_host_display.cpp
diff --git a/src/duckstation/opengl_host_display.h b/src/duckstation-sdl/opengl_host_display.h
similarity index 100%
rename from src/duckstation/opengl_host_display.h
rename to src/duckstation-sdl/opengl_host_display.h
diff --git a/src/duckstation/sdl_audio_stream.cpp b/src/duckstation-sdl/sdl_audio_stream.cpp
similarity index 100%
rename from src/duckstation/sdl_audio_stream.cpp
rename to src/duckstation-sdl/sdl_audio_stream.cpp
diff --git a/src/duckstation/sdl_audio_stream.h b/src/duckstation-sdl/sdl_audio_stream.h
similarity index 100%
rename from src/duckstation/sdl_audio_stream.h
rename to src/duckstation-sdl/sdl_audio_stream.h
diff --git a/src/duckstation/sdl_host_interface.cpp b/src/duckstation-sdl/sdl_host_interface.cpp
similarity index 100%
rename from src/duckstation/sdl_host_interface.cpp
rename to src/duckstation-sdl/sdl_host_interface.cpp
diff --git a/src/duckstation/sdl_host_interface.h b/src/duckstation-sdl/sdl_host_interface.h
similarity index 100%
rename from src/duckstation/sdl_host_interface.h
rename to src/duckstation-sdl/sdl_host_interface.h
diff --git a/src/duckstation/sdl_settings_interface.cpp b/src/duckstation-sdl/sdl_settings_interface.cpp
similarity index 100%
rename from src/duckstation/sdl_settings_interface.cpp
rename to src/duckstation-sdl/sdl_settings_interface.cpp
diff --git a/src/duckstation/sdl_settings_interface.h b/src/duckstation-sdl/sdl_settings_interface.h
similarity index 100%
rename from src/duckstation/sdl_settings_interface.h
rename to src/duckstation-sdl/sdl_settings_interface.h