Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 13:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post cleanup fixes.

Browse source
This commit is contained in:
Jean-Philip Desjardins 2023-05-17 20:16:28 -04:00
parent 399bc4150b
commit 070261ef53
9 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build-js.yaml vendored
View file

@ -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

4
Source/ui_js/CMakeLists.txt
View file

@ -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})

2
Source/ui_js/Main.cpp
View file

@ -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"

2
Source/ui_qt/CMakeLists.txt
View file

@ -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)

2
Source/ui_qt/mainwindow.cpp
View file

@ -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

2
js/psfplayer_node/index.ts
View file

@ -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");

24
tools/PsfPlayer/CMakeLists.txt
View file

@ -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()

8
tools/PsfPlayer/installer_win32/installer32.nsi
View file

@ -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

8
tools/PsfPlayer/installer_win32/installer64.nsi
View file

@ -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