mirror of
https://github.com/suyu-emu/Yucom.git
synced 2026-09-21 13:22:43 -07:00
glslang: Build from source instead of prebuilt binary.
This commit is contained in:
committed by
Arkadiusz Hiler
parent
8f0b458bca
commit
4ee7c0c666
@@ -58,3 +58,6 @@
|
||||
[submodule "graphene"]
|
||||
path = graphene
|
||||
url = https://github.com/ebassi/graphene
|
||||
[submodule "glslang"]
|
||||
path = glslang
|
||||
url = https://github.com/KhronosGroup/glslang
|
||||
|
||||
+11
@@ -615,6 +615,15 @@ $(eval $(call rules-cmake,vulkan-loader,32,CROSS))
|
||||
$(eval $(call rules-cmake,vulkan-loader,64,CROSS))
|
||||
|
||||
|
||||
##
|
||||
## glslang
|
||||
##
|
||||
|
||||
$(eval $(call rules-source,glslang,$(SRCDIR)/glslang))
|
||||
$(eval $(call rules-cmake,glslang,32))
|
||||
$(eval $(call rules-cmake,glslang,64))
|
||||
|
||||
|
||||
##
|
||||
## lsteamclient
|
||||
##
|
||||
@@ -767,6 +776,7 @@ $(OBJ)/.vrclient-post-source:
|
||||
|
||||
DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
|
||||
DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
|
||||
DXVK_DEPENDS = glslang
|
||||
|
||||
$(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
|
||||
$(eval $(call rules-meson,dxvk,32,CROSS))
|
||||
@@ -855,6 +865,7 @@ VKD3D_PROTON_SOURCE_ARGS = \
|
||||
|
||||
VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
|
||||
VKD3D_PROTON_MESON_ARGS64 = --bindir=$(VKD3D_PROTON_DST64)/lib64/wine/vkd3d-proton
|
||||
VKD3D_PROTON_DEPENDS = glslang
|
||||
|
||||
$(eval $(call rules-source,vkd3d-proton,$(SRCDIR)/vkd3d-proton))
|
||||
$(eval $(call rules-meson,vkd3d-proton,32,CROSS))
|
||||
|
||||
Submodule
+1
Submodule glslang added at df7fec2cfa
Binary file not shown.
@@ -124,7 +124,7 @@ $(2)_ENV$(3) = \
|
||||
RC="$$(TARGET_CROSS$(3))-windres" \
|
||||
WIDL="$$(TARGET_CROSS$(3))-widl" \
|
||||
PKG_CONFIG="$$(TARGET_$(3))-pkg-config" \
|
||||
PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$(SRC)/glslang/bin:$$$$PATH" \
|
||||
PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$$$PATH" \
|
||||
LD_LIBRARY_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))),,:)$$$$LD_LIBRARY_PATH" \
|
||||
PKG_CONFIG_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))/pkgconfig))" \
|
||||
PKG_CONFIG_LIBDIR="/usr/lib/$$(PKG_CONFIG_TARGET_$(4)$(3))/pkgconfig:/usr/share/pkgconfig" \
|
||||
|
||||
Reference in New Issue
Block a user