fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into vulkan

Browse Source
This commit is contained in:
Triang3l
2021-10-31 16:27:37 +03:00
parent cf85bf2efd ddc3885795
commit ce68a09b0c
40 changed files with 897 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/FFmpeg vendored

Submodule third_party/FFmpeg updated: 09eac851ef...15ece0882e

2
third_party/SDL2.lua vendored
View File

@@ -30,7 +30,7 @@ function sdl2_include()
includedirs({
path.getrelative(".", third_party_path) .. "/SDL2/include",
})
filter("platforms:Linux")
filter("platforms:Linux or platforms:Mac")
includedirs(sdl2_sys_includedirs)
filter({})
end

1
third_party/premake-androidmk vendored

Submodule third_party/premake-androidmk deleted from 01a84c7eee

1
third_party/premake-androidndk vendored Submodule

Submodule third_party/premake-androidndk added at e6132d3f78