mirror of https://github.com/xemu-project/xemu.git
ubuntu-win64-cross: Drop some deps in favor of subproject wraps
This commit is contained in:
parent
ec5c3955ee
commit
f922d08a5b
|
@ -78,9 +78,6 @@ RUN make \
|
|||
|
||||
RUN rm ${MXE_PATH}/src/sdl2*.patch
|
||||
COPY vulkan-headers.mk \
|
||||
spirv-headers.mk \
|
||||
spirv-tools.mk \
|
||||
glslang.mk \
|
||||
glib.mk \
|
||||
sdl2.mk \
|
||||
libsamplerate.mk \
|
||||
|
@ -101,10 +98,7 @@ RUN make \
|
|||
cmake \
|
||||
libslirp \
|
||||
sdl2 \
|
||||
vulkan-headers \
|
||||
spirv-headers \
|
||||
spirv-tools \
|
||||
glslang
|
||||
vulkan-headers
|
||||
|
||||
RUN find ${MXE_PATH}/usr -executable -type f -exec chmod a+x {} \;
|
||||
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
PKG := glslang
|
||||
$(PKG)_WEBSITE := https://github.com/KhronosGroup/glslang
|
||||
$(PKG)_DESCR := glslang
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 15.0.0
|
||||
$(PKG)_SUBDIR := glslang-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := glslang-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_CHECKSUM := c31c8c2e89af907507c0631273989526ee7d5cdf7df95ececd628fd7b811e064
|
||||
$(PKG)_URL := https://github.com/KhronosGroup/glslang/archive/refs/tags/$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_DEPS := cc spirv-tools
|
||||
|
||||
define $(PKG)_BUILD
|
||||
$(TARGET)-cmake -B'$(BUILD_DIR)' -S'$(SOURCE_DIR)' \
|
||||
-G"Ninja" \
|
||||
-DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
|
||||
-DENABLE_GLSLANG_BINARIES=OFF \
|
||||
-DGLSLANG_TESTS=OFF \
|
||||
-DBUILD_EXTERNAL=OFF \
|
||||
-DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
|
||||
-DVERBOSE=1
|
||||
$(TARGET)-cmake --build '$(BUILD_DIR)'
|
||||
$(TARGET)-cmake --install '$(BUILD_DIR)'
|
||||
endef
|
||||
|
||||
# FIXME: Shared libs
|
|
@ -1,16 +0,0 @@
|
|||
PKG := spirv-headers
|
||||
$(PKG)_WEBSITE := https://github.com/KhronosGroup/SPIRV-Headers
|
||||
$(PKG)_DESCR := SPIRV-Headers
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := vulkan-sdk-1.3.296.0
|
||||
$(PKG)_SUBDIR := SPIRV-Headers-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := spirv-headers-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_CHECKSUM := 1423d58a1171611d5aba2bf6f8c69c72ef9c38a0aca12c3493e4fda64c9b2dc6
|
||||
$(PKG)_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_DEPS := cc
|
||||
|
||||
define $(PKG)_BUILD
|
||||
$(TARGET)-cmake -B'$(BUILD_DIR)' -S'$(SOURCE_DIR)'
|
||||
$(TARGET)-cmake --build '$(BUILD_DIR)'
|
||||
$(TARGET)-cmake --install '$(BUILD_DIR)'
|
||||
endef
|
|
@ -1,27 +0,0 @@
|
|||
PKG := spirv-tools
|
||||
$(PKG)_WEBSITE := https://github.com/KhronosGroup/SPIRV-Tools
|
||||
$(PKG)_DESCR := SPIRV-Tools
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := vulkan-sdk-1.3.296.0
|
||||
$(PKG)_SUBDIR := SPIRV-Tools-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := spirv-tools-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_CHECKSUM := 75aafdf7e731b4b6bfb36a590ddfbb38ebc605d80487f38254da24fe0cb95837
|
||||
$(PKG)_URL := https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_DEPS := cc spirv-headers
|
||||
|
||||
define $(PKG)_BUILD
|
||||
$(TARGET)-cmake -B'$(BUILD_DIR)' -S'$(SOURCE_DIR)' \
|
||||
-G"Ninja" \
|
||||
-DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
|
||||
-DSPIRV-Headers_SOURCE_DIR=$(PREFIX)/$(TARGET) \
|
||||
-DSPIRV_WERROR=OFF \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DSPIRV_TOOLS_BUILD_STATIC=ON \
|
||||
-DSPIRV_SKIP_EXECUTABLES=ON \
|
||||
-DSPIRV_SKIP_TESTS=ON \
|
||||
-DVERBOSE=1
|
||||
$(TARGET)-cmake --build '$(BUILD_DIR)'
|
||||
$(TARGET)-cmake --install '$(BUILD_DIR)'
|
||||
endef
|
||||
|
||||
# FIXME: Shared libs
|
Loading…
Reference in New Issue