diff --git a/.github/workflows/build-js.yaml b/.github/workflows/build-js.yaml index 318899a51..8cdce8267 100644 --- a/.github/workflows/build-js.yaml +++ b/.github/workflows/build-js.yaml @@ -48,10 +48,10 @@ jobs: - name: Build PsfPlayer Browser run: | cd js/psfplayer_browser - cp ../../build/tools/PsfPlayer/Source/js_ui/PsfPlayer.js ./src/ - cp ../../build/tools/PsfPlayer/Source/js_ui/PsfPlayer.wasm ./public/ - cp ../../build/tools/PsfPlayer/Source/js_ui/PsfPlayer.js ./public/ - cp ../../build/tools/PsfPlayer/Source/js_ui/PsfPlayer.worker.js ./public/ + cp ../../build/tools/PsfPlayer/Source/ui_js/PsfPlayer.js ./src/ + cp ../../build/tools/PsfPlayer/Source/ui_js/PsfPlayer.wasm ./public/ + cp ../../build/tools/PsfPlayer/Source/ui_js/PsfPlayer.js ./public/ + cp ../../build/tools/PsfPlayer/Source/ui_js/PsfPlayer.worker.js ./public/ export REACT_APP_VERSION=$(git describe) npm install npm run build diff --git a/Source/ui_js/CMakeLists.txt b/Source/ui_js/CMakeLists.txt index b0933473a..2a7b13a0a 100644 --- a/Source/ui_js/CMakeLists.txt +++ b/Source/ui_js/CMakeLists.txt @@ -40,8 +40,8 @@ add_executable(Play Main.cpp Ps2VmJs.cpp Ps2VmJs.h - ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/PsfPlayer/Source/js_ui/SH_OpenALProxy.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/PsfPlayer/Source/js_ui/SH_OpenALProxy.h + ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/PsfPlayer/Source/ui_js/SH_OpenALProxy.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/PsfPlayer/Source/ui_js/SH_OpenALProxy.h ) target_link_libraries(Play PUBLIC ${PROJECT_LIBS}) diff --git a/Source/ui_js/Main.cpp b/Source/ui_js/Main.cpp index 36f57a722..6dc07dc26 100644 --- a/Source/ui_js/Main.cpp +++ b/Source/ui_js/Main.cpp @@ -3,7 +3,7 @@ #include "Ps2VmJs.h" #include "GSH_OpenGLJs.h" #include "../../tools/PsfPlayer/Source/SH_OpenAL.h" -#include "../../tools/PsfPlayer/Source/js_ui/SH_OpenALProxy.h" +#include "../../tools/PsfPlayer/Source/ui_js/SH_OpenALProxy.h" #include "input/PH_GenericInput.h" #include "InputProviderEmscripten.h" diff --git a/Source/ui_qt/CMakeLists.txt b/Source/ui_qt/CMakeLists.txt index e89e79c8b..f2c1fac3b 100644 --- a/Source/ui_qt/CMakeLists.txt +++ b/Source/ui_qt/CMakeLists.txt @@ -170,7 +170,7 @@ if(TARGET_PLATFORM_WIN32) set(QT_SOURCES ${QT_SOURCES} - ../../tools/PsfPlayer/Source/win32_ui/SH_WaveOut.cpp + ../../tools/PsfPlayer/Source/ui_win32/SH_WaveOut.cpp ) list(APPEND PROJECT_LIBS winmm) diff --git a/Source/ui_qt/mainwindow.cpp b/Source/ui_qt/mainwindow.cpp index 4d001a160..7a2262f81 100644 --- a/Source/ui_qt/mainwindow.cpp +++ b/Source/ui_qt/mainwindow.cpp @@ -34,7 +34,7 @@ #include "string_format.h" #ifdef _WIN32 -#include "../../tools/PsfPlayer/Source/win32_ui/SH_WaveOut.h" +#include "../../tools/PsfPlayer/Source/ui_win32/SH_WaveOut.h" #else #include "tools/PsfPlayer/Source/SH_OpenAL.h" #endif diff --git a/js/psfplayer_node/index.ts b/js/psfplayer_node/index.ts index e2325b594..a0b205ef7 100644 --- a/js/psfplayer_node/index.ts +++ b/js/psfplayer_node/index.ts @@ -9,7 +9,7 @@ function convertStringVectorToArray(strVector : any) { } var main = async function() { - let factory = require("../../../build_cmake/build_wasm/tools/PsfPlayer/Source/js_ui/PsfPlayer.js"); + let factory = require("../../../build_cmake/build_wasm/tools/PsfPlayer/Source/ui_js/PsfPlayer.js"); let module = await factory(); module.FS.mkdir("/work"); module.FS.mount(module.NODEFS, { root: "."}, "/work"); diff --git a/tools/PsfPlayer/CMakeLists.txt b/tools/PsfPlayer/CMakeLists.txt index 1e45b3212..94dcd1e92 100644 --- a/tools/PsfPlayer/CMakeLists.txt +++ b/tools/PsfPlayer/CMakeLists.txt @@ -16,23 +16,13 @@ endif() if(BUILD_AOT_CACHE) add_subdirectory(Source/ui_aot) else() - if(TARGET_PLATFORM_MACOS AND NOT USE_QT) - add_subdirectory(Source/macosx_ui/) - endif(TARGET_PLATFORM_MACOS AND NOT USE_QT) - if(TARGET_PLATFORM_WIN32 AND NOT USE_QT) - add_subdirectory(Source/win32_ui/) - endif(TARGET_PLATFORM_WIN32 AND NOT USE_QT) - - if(TARGET_PLATFORM_IOS) - add_subdirectory(Source/ios_ui/) - endif(TARGET_PLATFORM_IOS) - - if(TARGET_PLATFORM_JS) - add_subdirectory(Source/js_ui/) + add_subdirectory(Source/ui_win32/) + elseif(TARGET_PLATFORM_IOS) + add_subdirectory(Source/ui_ios/) + elseif(TARGET_PLATFORM_JS) + add_subdirectory(Source/ui_js/) + else() + add_subdirectory(Source/ui_qt/) endif() - - if(USE_QT) - add_subdirectory(Source/unix_ui/) - endif(USE_QT) endif() diff --git a/tools/PsfPlayer/installer_win32/installer32.nsi b/tools/PsfPlayer/installer_win32/installer32.nsi index b5e0f5d24..3cd6d2891 100644 --- a/tools/PsfPlayer/installer_win32/installer32.nsi +++ b/tools/PsfPlayer/installer_win32/installer32.nsi @@ -62,10 +62,10 @@ Section "PsfPlayer (required)" SetOutPath $INSTDIR ; Put file there - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\PsfPlayer.exe" - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\SH_WaveOut.dll" - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\SH_XAudio2.dll" - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\TDEmu.dll" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\PsfPlayer.exe" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\SH_WaveOut.dll" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\SH_XAudio2.dll" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\TDEmu.dll" File "..\changelog.html" ; Write the installation path into the registry diff --git a/tools/PsfPlayer/installer_win32/installer64.nsi b/tools/PsfPlayer/installer_win32/installer64.nsi index cabd39e63..c6017d09d 100644 --- a/tools/PsfPlayer/installer_win32/installer64.nsi +++ b/tools/PsfPlayer/installer_win32/installer64.nsi @@ -63,10 +63,10 @@ Section "PsfPlayer (required)" SetOutPath $INSTDIR ; Put file there - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\PsfPlayer.exe" - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\SH_WaveOut.dll" - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\SH_XAudio2.dll" - File "..\..\..\build\tools\PsfPlayer\Source\win32_ui\Release\TDEmu64.dll" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\PsfPlayer.exe" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\SH_WaveOut.dll" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\SH_XAudio2.dll" + File "..\..\..\build\tools\PsfPlayer\Source\ui_win32\Release\TDEmu64.dll" File "..\changelog.html" ; Write the installation path into the registry