From bddbab9d606214ba7880bc4a46e20cdee10f6348 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Fri, 4 Oct 2019 13:54:09 +1000 Subject: [PATCH] Rename to DuckStation --- CMakeLists.txt | 17 ++++------------- pse.sln => duckstation.sln | 4 ++-- src/CMakeLists.txt | 6 ++---- src/core/CMakeLists.txt | 16 ++++++++++++++++ src/{pse => core}/bus.cpp | 0 src/{pse => core}/bus.h | 0 src/{pse => core}/bus.inl | 0 src/{pse => core}/cdrom.cpp | 0 src/{pse => core}/cdrom.h | 0 src/{pse/pse.vcxproj => core/core.vcxproj} | 1 + .../core.vcxproj.filters} | 0 src/{pse => core}/cpu_core.cpp | 0 src/{pse => core}/cpu_core.h | 0 src/{pse => core}/cpu_core.inl | 0 src/{pse => core}/cpu_disasm.cpp | 0 src/{pse => core}/cpu_disasm.h | 0 src/{pse => core}/cpu_types.h | 0 src/{pse => core}/digital_controller.cpp | 0 src/{pse => core}/digital_controller.h | 0 src/{pse => core}/dma.cpp | 0 src/{pse => core}/dma.h | 0 src/{pse => core}/gpu.cpp | 0 src/{pse => core}/gpu.h | 0 src/{pse => core}/gpu_hw.cpp | 0 src/{pse => core}/gpu_hw.h | 0 src/{pse => core}/gpu_hw_opengl.cpp | 0 src/{pse => core}/gpu_hw_opengl.h | 0 src/{pse => core}/gte.cpp | 0 src/{pse => core}/gte.h | 0 src/{pse => core}/gte.inl | 0 src/{pse => core}/gte_types.h | 0 src/{pse => core}/host_interface.cpp | 0 src/{pse => core}/host_interface.h | 0 src/{pse => core}/interrupt_controller.cpp | 0 src/{pse => core}/interrupt_controller.h | 0 src/{pse => core}/mdec.cpp | 0 src/{pse => core}/mdec.h | 0 src/{pse => core}/memory_card.cpp | 0 src/{pse => core}/memory_card.h | 0 src/{pse => core}/pad.cpp | 0 src/{pse => core}/pad.h | 0 src/{pse => core}/pad_device.cpp | 0 src/{pse => core}/pad_device.h | 0 src/{pse => core}/save_state_version.h | 0 src/{pse => core}/spu.cpp | 0 src/{pse => core}/spu.h | 0 src/{pse => core}/system.cpp | 0 src/{pse => core}/system.h | 0 src/{pse => core}/timers.cpp | 0 src/{pse => core}/timers.h | 0 src/{pse => core}/types.h | 0 src/duckstation/CMakeLists.txt | 11 +++++++++++ .../duckstation.vcxproj} | 4 ++-- .../duckstation.vcxproj.filters} | 0 src/{pse-sdl => duckstation}/main.cpp | 3 +-- .../sdl_audio_mixer.cpp | 0 src/{pse-sdl => duckstation}/sdl_audio_mixer.h | 0 src/{pse-sdl => duckstation}/sdl_interface.cpp | 6 +++--- src/{pse-sdl => duckstation}/sdl_interface.h | 2 +- src/pse-sdl/CMakeLists.txt | 11 ----------- src/pse/CMakeLists.txt | 16 ---------------- 61 files changed, 43 insertions(+), 54 deletions(-) rename pse.sln => duckstation.sln (97%) create mode 100644 src/core/CMakeLists.txt rename src/{pse => core}/bus.cpp (100%) rename src/{pse => core}/bus.h (100%) rename src/{pse => core}/bus.inl (100%) rename src/{pse => core}/cdrom.cpp (100%) rename src/{pse => core}/cdrom.h (100%) rename src/{pse/pse.vcxproj => core/core.vcxproj} (99%) rename src/{pse/pse.vcxproj.filters => core/core.vcxproj.filters} (100%) rename src/{pse => core}/cpu_core.cpp (100%) rename src/{pse => core}/cpu_core.h (100%) rename src/{pse => core}/cpu_core.inl (100%) rename src/{pse => core}/cpu_disasm.cpp (100%) rename src/{pse => core}/cpu_disasm.h (100%) rename src/{pse => core}/cpu_types.h (100%) rename src/{pse => core}/digital_controller.cpp (100%) rename src/{pse => core}/digital_controller.h (100%) rename src/{pse => core}/dma.cpp (100%) rename src/{pse => core}/dma.h (100%) rename src/{pse => core}/gpu.cpp (100%) rename src/{pse => core}/gpu.h (100%) rename src/{pse => core}/gpu_hw.cpp (100%) rename src/{pse => core}/gpu_hw.h (100%) rename src/{pse => core}/gpu_hw_opengl.cpp (100%) rename src/{pse => core}/gpu_hw_opengl.h (100%) rename src/{pse => core}/gte.cpp (100%) rename src/{pse => core}/gte.h (100%) rename src/{pse => core}/gte.inl (100%) rename src/{pse => core}/gte_types.h (100%) rename src/{pse => core}/host_interface.cpp (100%) rename src/{pse => core}/host_interface.h (100%) rename src/{pse => core}/interrupt_controller.cpp (100%) rename src/{pse => core}/interrupt_controller.h (100%) rename src/{pse => core}/mdec.cpp (100%) rename src/{pse => core}/mdec.h (100%) rename src/{pse => core}/memory_card.cpp (100%) rename src/{pse => core}/memory_card.h (100%) rename src/{pse => core}/pad.cpp (100%) rename src/{pse => core}/pad.h (100%) rename src/{pse => core}/pad_device.cpp (100%) rename src/{pse => core}/pad_device.h (100%) rename src/{pse => core}/save_state_version.h (100%) rename src/{pse => core}/spu.cpp (100%) rename src/{pse => core}/spu.h (100%) rename src/{pse => core}/system.cpp (100%) rename src/{pse => core}/system.h (100%) rename src/{pse => core}/timers.cpp (100%) rename src/{pse => core}/timers.h (100%) rename src/{pse => core}/types.h (100%) create mode 100644 src/duckstation/CMakeLists.txt rename src/{pse-sdl/pse-sdl.vcxproj => duckstation/duckstation.vcxproj} (99%) rename src/{pse-sdl/pse-sdl.vcxproj.filters => duckstation/duckstation.vcxproj.filters} (100%) rename src/{pse-sdl => duckstation}/main.cpp (98%) rename src/{pse-sdl => duckstation}/sdl_audio_mixer.cpp (100%) rename src/{pse-sdl => duckstation}/sdl_audio_mixer.h (100%) rename src/{pse-sdl => duckstation}/sdl_interface.cpp (99%) rename src/{pse-sdl => duckstation}/sdl_interface.h (98%) delete mode 100644 src/pse-sdl/CMakeLists.txt delete mode 100644 src/pse/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index cb0a2587f..1c9c1fdc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(pse C CXX) - - -# Options -option(ENABLE_OPENGL "Enables OpenGL support in renderer" ON) -option(ENABLE_SDL_FRONTEND "Compiles the SDL frontend" ON) +project(duckstation C CXX) # Common include/library directories on Windows. if(WIN32) @@ -22,14 +17,10 @@ if(WIN32) endif() endif() - if(ENABLE_SDL_FRONTEND) - set(SDL2_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/include/SDL") - set(SDL2_LIBRARIES "SDL2") - endif() + set(SDL2_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/include/SDL") + set(SDL2_LIBRARIES "SDL2") else() - if(ENABLE_SDL_FRONTEND) - find_package(SDL2 REQUIRED) - endif() + find_package(SDL2 REQUIRED) endif() diff --git a/pse.sln b/duckstation.sln similarity index 97% rename from pse.sln rename to duckstation.sln index 9cb1e17a6..5e410bd6b 100644 --- a/pse.sln +++ b/duckstation.sln @@ -13,9 +13,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "dep\libsam EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common.vcxproj", "{EE054E08-3799-4A59-A422-18259C105FFD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pse", "src\pse\pse.vcxproj", "{868B98C8-65A1-494B-8346-250A73A48C0A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{868B98C8-65A1-494B-8346-250A73A48C0A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pse-sdl", "src\pse-sdl\pse-sdl.vcxproj", "{DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duckstation", "src\duckstation\duckstation.vcxproj", "{DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YBaseLib", "dep\YBaseLib\Source\YBaseLib.vcxproj", "{B56CE698-7300-4FA5-9609-942F1D05C5A2}" EndProject diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2fd8627d9..da4e77fe0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,3 @@ add_subdirectory(common) -add_subdirectory(pse) -if(ENABLE_SDL_FRONTEND) - add_subdirectory(pse-sdl) -endif() +add_subdirectory(core) +add_subdirectory(duckstation) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt new file mode 100644 index 000000000..3faef11e0 --- /dev/null +++ b/src/core/CMakeLists.txt @@ -0,0 +1,16 @@ +add_library(core + cpu_bus.cpp + cpu_bus.h + cpu_bus.inl + cpu_core.cpp + cpu_core.h + cpu_core.inl + system.cpp + system.h + types.h +) + +target_include_directories(core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..") +target_include_directories(core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") +target_link_libraries(core Threads::Threads YBaseLib common) + diff --git a/src/pse/bus.cpp b/src/core/bus.cpp similarity index 100% rename from src/pse/bus.cpp rename to src/core/bus.cpp diff --git a/src/pse/bus.h b/src/core/bus.h similarity index 100% rename from src/pse/bus.h rename to src/core/bus.h diff --git a/src/pse/bus.inl b/src/core/bus.inl similarity index 100% rename from src/pse/bus.inl rename to src/core/bus.inl diff --git a/src/pse/cdrom.cpp b/src/core/cdrom.cpp similarity index 100% rename from src/pse/cdrom.cpp rename to src/core/cdrom.cpp diff --git a/src/pse/cdrom.h b/src/core/cdrom.h similarity index 100% rename from src/pse/cdrom.h rename to src/core/cdrom.h diff --git a/src/pse/pse.vcxproj b/src/core/core.vcxproj similarity index 99% rename from src/pse/pse.vcxproj rename to src/core/core.vcxproj index 4a2f4411b..74a866a63 100644 --- a/src/pse/pse.vcxproj +++ b/src/core/core.vcxproj @@ -472,5 +472,6 @@ true + core \ No newline at end of file diff --git a/src/pse/pse.vcxproj.filters b/src/core/core.vcxproj.filters similarity index 100% rename from src/pse/pse.vcxproj.filters rename to src/core/core.vcxproj.filters diff --git a/src/pse/cpu_core.cpp b/src/core/cpu_core.cpp similarity index 100% rename from src/pse/cpu_core.cpp rename to src/core/cpu_core.cpp diff --git a/src/pse/cpu_core.h b/src/core/cpu_core.h similarity index 100% rename from src/pse/cpu_core.h rename to src/core/cpu_core.h diff --git a/src/pse/cpu_core.inl b/src/core/cpu_core.inl similarity index 100% rename from src/pse/cpu_core.inl rename to src/core/cpu_core.inl diff --git a/src/pse/cpu_disasm.cpp b/src/core/cpu_disasm.cpp similarity index 100% rename from src/pse/cpu_disasm.cpp rename to src/core/cpu_disasm.cpp diff --git a/src/pse/cpu_disasm.h b/src/core/cpu_disasm.h similarity index 100% rename from src/pse/cpu_disasm.h rename to src/core/cpu_disasm.h diff --git a/src/pse/cpu_types.h b/src/core/cpu_types.h similarity index 100% rename from src/pse/cpu_types.h rename to src/core/cpu_types.h diff --git a/src/pse/digital_controller.cpp b/src/core/digital_controller.cpp similarity index 100% rename from src/pse/digital_controller.cpp rename to src/core/digital_controller.cpp diff --git a/src/pse/digital_controller.h b/src/core/digital_controller.h similarity index 100% rename from src/pse/digital_controller.h rename to src/core/digital_controller.h diff --git a/src/pse/dma.cpp b/src/core/dma.cpp similarity index 100% rename from src/pse/dma.cpp rename to src/core/dma.cpp diff --git a/src/pse/dma.h b/src/core/dma.h similarity index 100% rename from src/pse/dma.h rename to src/core/dma.h diff --git a/src/pse/gpu.cpp b/src/core/gpu.cpp similarity index 100% rename from src/pse/gpu.cpp rename to src/core/gpu.cpp diff --git a/src/pse/gpu.h b/src/core/gpu.h similarity index 100% rename from src/pse/gpu.h rename to src/core/gpu.h diff --git a/src/pse/gpu_hw.cpp b/src/core/gpu_hw.cpp similarity index 100% rename from src/pse/gpu_hw.cpp rename to src/core/gpu_hw.cpp diff --git a/src/pse/gpu_hw.h b/src/core/gpu_hw.h similarity index 100% rename from src/pse/gpu_hw.h rename to src/core/gpu_hw.h diff --git a/src/pse/gpu_hw_opengl.cpp b/src/core/gpu_hw_opengl.cpp similarity index 100% rename from src/pse/gpu_hw_opengl.cpp rename to src/core/gpu_hw_opengl.cpp diff --git a/src/pse/gpu_hw_opengl.h b/src/core/gpu_hw_opengl.h similarity index 100% rename from src/pse/gpu_hw_opengl.h rename to src/core/gpu_hw_opengl.h diff --git a/src/pse/gte.cpp b/src/core/gte.cpp similarity index 100% rename from src/pse/gte.cpp rename to src/core/gte.cpp diff --git a/src/pse/gte.h b/src/core/gte.h similarity index 100% rename from src/pse/gte.h rename to src/core/gte.h diff --git a/src/pse/gte.inl b/src/core/gte.inl similarity index 100% rename from src/pse/gte.inl rename to src/core/gte.inl diff --git a/src/pse/gte_types.h b/src/core/gte_types.h similarity index 100% rename from src/pse/gte_types.h rename to src/core/gte_types.h diff --git a/src/pse/host_interface.cpp b/src/core/host_interface.cpp similarity index 100% rename from src/pse/host_interface.cpp rename to src/core/host_interface.cpp diff --git a/src/pse/host_interface.h b/src/core/host_interface.h similarity index 100% rename from src/pse/host_interface.h rename to src/core/host_interface.h diff --git a/src/pse/interrupt_controller.cpp b/src/core/interrupt_controller.cpp similarity index 100% rename from src/pse/interrupt_controller.cpp rename to src/core/interrupt_controller.cpp diff --git a/src/pse/interrupt_controller.h b/src/core/interrupt_controller.h similarity index 100% rename from src/pse/interrupt_controller.h rename to src/core/interrupt_controller.h diff --git a/src/pse/mdec.cpp b/src/core/mdec.cpp similarity index 100% rename from src/pse/mdec.cpp rename to src/core/mdec.cpp diff --git a/src/pse/mdec.h b/src/core/mdec.h similarity index 100% rename from src/pse/mdec.h rename to src/core/mdec.h diff --git a/src/pse/memory_card.cpp b/src/core/memory_card.cpp similarity index 100% rename from src/pse/memory_card.cpp rename to src/core/memory_card.cpp diff --git a/src/pse/memory_card.h b/src/core/memory_card.h similarity index 100% rename from src/pse/memory_card.h rename to src/core/memory_card.h diff --git a/src/pse/pad.cpp b/src/core/pad.cpp similarity index 100% rename from src/pse/pad.cpp rename to src/core/pad.cpp diff --git a/src/pse/pad.h b/src/core/pad.h similarity index 100% rename from src/pse/pad.h rename to src/core/pad.h diff --git a/src/pse/pad_device.cpp b/src/core/pad_device.cpp similarity index 100% rename from src/pse/pad_device.cpp rename to src/core/pad_device.cpp diff --git a/src/pse/pad_device.h b/src/core/pad_device.h similarity index 100% rename from src/pse/pad_device.h rename to src/core/pad_device.h diff --git a/src/pse/save_state_version.h b/src/core/save_state_version.h similarity index 100% rename from src/pse/save_state_version.h rename to src/core/save_state_version.h diff --git a/src/pse/spu.cpp b/src/core/spu.cpp similarity index 100% rename from src/pse/spu.cpp rename to src/core/spu.cpp diff --git a/src/pse/spu.h b/src/core/spu.h similarity index 100% rename from src/pse/spu.h rename to src/core/spu.h diff --git a/src/pse/system.cpp b/src/core/system.cpp similarity index 100% rename from src/pse/system.cpp rename to src/core/system.cpp diff --git a/src/pse/system.h b/src/core/system.h similarity index 100% rename from src/pse/system.h rename to src/core/system.h diff --git a/src/pse/timers.cpp b/src/core/timers.cpp similarity index 100% rename from src/pse/timers.cpp rename to src/core/timers.cpp diff --git a/src/pse/timers.h b/src/core/timers.h similarity index 100% rename from src/pse/timers.h rename to src/core/timers.h diff --git a/src/pse/types.h b/src/core/types.h similarity index 100% rename from src/pse/types.h rename to src/core/types.h diff --git a/src/duckstation/CMakeLists.txt b/src/duckstation/CMakeLists.txt new file mode 100644 index 000000000..0658ea63b --- /dev/null +++ b/src/duckstation/CMakeLists.txt @@ -0,0 +1,11 @@ +set(SRCS + main.cpp + sdl_audio_mixer.cpp + sdl_audio_mixer.h + sdl_interface.cpp + sdl_interface.h +) + +add_executable(duckstation ${SRCS}) +target_include_directories(duckstation PRIVATE "${SDL2_INCLUDE_DIRS}") +target_link_libraries(duckstation core imgui "${SDL2_LIBRARIES}") diff --git a/src/pse-sdl/pse-sdl.vcxproj b/src/duckstation/duckstation.vcxproj similarity index 99% rename from src/pse-sdl/pse-sdl.vcxproj rename to src/duckstation/duckstation.vcxproj index dab41ddf9..5db7c672e 100644 --- a/src/pse-sdl/pse-sdl.vcxproj +++ b/src/duckstation/duckstation.vcxproj @@ -44,7 +44,7 @@ {ee054e08-3799-4a59-a422-18259c105ffd} - + {868b98c8-65a1-494b-8346-250a73a48c0a} @@ -60,7 +60,7 @@ {DAA8F93D-9C17-4DE2-BD0B-57891E0FF0D9} Win32Proj - pse-sdl + duckstation 10.0 diff --git a/src/pse-sdl/pse-sdl.vcxproj.filters b/src/duckstation/duckstation.vcxproj.filters similarity index 100% rename from src/pse-sdl/pse-sdl.vcxproj.filters rename to src/duckstation/duckstation.vcxproj.filters diff --git a/src/pse-sdl/main.cpp b/src/duckstation/main.cpp similarity index 98% rename from src/pse-sdl/main.cpp rename to src/duckstation/main.cpp index 6ff0a977e..e0355df2f 100644 --- a/src/pse-sdl/main.cpp +++ b/src/duckstation/main.cpp @@ -1,8 +1,7 @@ #include "YBaseLib/Assert.h" #include "YBaseLib/Log.h" #include "YBaseLib/StringConverter.h" -#include "pse/system.h" -#include "pse/types.h" +#include "core/system.h" #include "sdl_interface.h" #include #include diff --git a/src/pse-sdl/sdl_audio_mixer.cpp b/src/duckstation/sdl_audio_mixer.cpp similarity index 100% rename from src/pse-sdl/sdl_audio_mixer.cpp rename to src/duckstation/sdl_audio_mixer.cpp diff --git a/src/pse-sdl/sdl_audio_mixer.h b/src/duckstation/sdl_audio_mixer.h similarity index 100% rename from src/pse-sdl/sdl_audio_mixer.h rename to src/duckstation/sdl_audio_mixer.h diff --git a/src/pse-sdl/sdl_interface.cpp b/src/duckstation/sdl_interface.cpp similarity index 99% rename from src/pse-sdl/sdl_interface.cpp rename to src/duckstation/sdl_interface.cpp index 1adac314b..4e72ab4fa 100644 --- a/src/pse-sdl/sdl_interface.cpp +++ b/src/duckstation/sdl_interface.cpp @@ -5,9 +5,9 @@ #include "imgui.h" #include "imgui_impl_opengl3.h" #include "imgui_impl_sdl.h" -#include "pse/digital_controller.h" -#include "pse/memory_card.h" -#include "pse/system.h" +#include "core/digital_controller.h" +#include "core/memory_card.h" +#include "core/system.h" #include #include Log_SetChannel(SDLInterface); diff --git a/src/pse-sdl/sdl_interface.h b/src/duckstation/sdl_interface.h similarity index 98% rename from src/pse-sdl/sdl_interface.h rename to src/duckstation/sdl_interface.h index 51c67e021..5e3adf3f6 100644 --- a/src/pse-sdl/sdl_interface.h +++ b/src/duckstation/sdl_interface.h @@ -3,7 +3,7 @@ #include "YBaseLib/Timer.h" #include "common/gl_program.h" #include "common/gl_texture.h" -#include "pse/host_interface.h" +#include "core/host_interface.h" #include #include #include diff --git a/src/pse-sdl/CMakeLists.txt b/src/pse-sdl/CMakeLists.txt deleted file mode 100644 index 59be52a0c..000000000 --- a/src/pse-sdl/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(SRCS - main.cpp - sdl_audio_mixer.cpp - sdl_audio_mixer.h - sdl_interface.cpp - sdl_interface.h -) - -add_executable(pse-sdl ${SRCS}) -target_include_directories(pse-sdl PRIVATE "${SDL2_INCLUDE_DIRS}") -target_link_libraries(pse-sdl pse imgui "${SDL2_LIBRARIES}") diff --git a/src/pse/CMakeLists.txt b/src/pse/CMakeLists.txt deleted file mode 100644 index e57395082..000000000 --- a/src/pse/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -add_library(pse - cpu_bus.cpp - cpu_bus.h - cpu_bus.inl - cpu_core.cpp - cpu_core.h - cpu_core.inl - system.cpp - system.h - types.h -) - -target_include_directories(pse PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..") -target_include_directories(pse PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") -target_link_libraries(pse Threads::Threads YBaseLib common) -