Skip to content

Commit

Permalink
Merge pull request #363 from Wolf3s/cmake-vita
Browse files Browse the repository at this point in the history
[HOTFIX]: Replace gnuton dockerhub to vitasdk official docker.
  • Loading branch information
sahlberg committed Aug 25, 2024
2 parents 0fba3b2 + 75dd4aa commit fb5597b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
run: |
make -f Makefile.platform ps2_ee_all clean
- name: Compile PS2 EE IPS Side
- name: Compile PS2 EE RPC Side
run: |
make -f Makefile.platform ps2_ips_all clean
make -f Makefile.platform ps2_rpc_all clean
- name: Compile PS2 IOP Side
run: |
Expand All @@ -69,12 +69,8 @@ jobs:
name: VITA build

runs-on: ubuntu-latest
container: gnuton/vitasdk-docker:latest
container: vitasdk/vitasdk:latest
steps:
- name: Install dependencies
run: |
sudo apt update -y && sudo apt upgrade -y && sudo apt install -qq -y pkg-config ffmpeg gettext smpq
- name: git checkout
uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion Makefile.platform
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ ps2_iop_install: ps2_iop_all
cmake --build build --target install

ps2_irx_all:
cmake -S . -B build -DBUILD_IRX=1 "-DCMAKE_TOOLCHAIN_FILE=${PS2DEV}/share/ps2dev_iop.cmake" "-DCMAKE_INSTALL_PREFIX=${PS2SDK}/ports_iop/irx" "-DCMAKE_INSTALL_PREFIX=${PS2SDK}/ports_irx"
cmake -S . -B build -DBUILD_IRX=1 "-DCMAKE_TOOLCHAIN_FILE=${PS2DEV}/share/ps2dev_iop.cmake"
cmake --build build

ps2_irx_install: ps2_irx_all
Expand Down
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ elseif(IOP AND BUILD_IRX)
install(FILES ps2/ps2smb2.h
DESTINATION ${PS2SDK}/common/include)
install(TARGETS smb2man.irx EXPORT smb2man.irx
RUNTIME DESTINATION bin
RUNTIME DESTINATION ${PS2SDK}/ports_iop/irx
ARCHIVE DESTINATION smb2man.irx
LIBRARY DESTINATION smb2man.irx)
else()
Expand Down

0 comments on commit fb5597b

Please sign in to comment.