diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml index b930ff4be1..d8b75e6e6b 100644 --- a/.github/workflows/vita.yml +++ b/.github/workflows/vita.yml @@ -18,6 +18,10 @@ jobs: run: | apk add --no-cache aws-cli ccache git ninja vdpm curl libzip openssl SceShaccCgExt vitaShaRK taihen zlib + git clone -b exceptions_mprotect --depth 1 https://github.com/bythos14/kubridge.git + cmake -S kubridge -B kubridge_build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DCMAKE_BUILD_TYPE=Release + cmake --build kubridge_build --config Release --target kubridge_all + cmake --install kubridge_build git clone -b vitagl --depth 1 https://github.com/Northfear/SDL.git cmake -S SDL -B SDL_build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DVIDEO_VITA_VGL=ON cmake --build SDL_build --config Release diff --git a/.gitmodules b/.gitmodules index 9c67990b19..c4747d15b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,6 +29,3 @@ [submodule "core/deps/Spout"] path = core/deps/Spout url = https://github.com/vkedwardli/Spout2.git -[submodule "core/deps/kubridge"] - path = core/deps/kubridge - url = https://github.com/bythos14/kubridge.git diff --git a/CMakeLists.txt b/CMakeLists.txt index da35a5c288..b6d274b958 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,14 +672,11 @@ if(NOT LIBZIP_FOUND OR NINTENDO_SWITCH) endif() if(VITA) - add_subdirectory(core/deps/kubridge) - add_dependencies(${PROJECT_NAME} kubridge_all) - target_include_directories(${PROJECT_NAME} PRIVATE core/deps/kubridge) # to override system kubridge.h if present target_link_libraries(${PROJECT_NAME} PRIVATE -Wl,--whole-archive pthread -Wl,--no-whole-archive stdc++ SDL2 - ${CMAKE_CURRENT_BINARY_DIR}/core/deps/kubridge/stubs/libkubridge_stub.a + kubridge_stub ScePgf_stub SceHid_stub SceAppMgr_stub diff --git a/core/deps/kubridge b/core/deps/kubridge deleted file mode 160000 index a4ef20fc3a..0000000000 --- a/core/deps/kubridge +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a4ef20fc3ab07b493f9d7d67703272831e445e21