vulkan rebuild

This commit is contained in:
Rmys
2020-07-13 19:53:30 +00:00
committed by GitHub
parent dbb99a92af
commit ba29293726
2 changed files with 6 additions and 8 deletions
+3 -5
View File
@@ -36,10 +36,8 @@ def setup():
-DBUILD_WSI_WAYLAND_SUPPORT=On \ -DBUILD_WSI_WAYLAND_SUPPORT=On \
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=ON \
-DBUILD_LAYER_SUPPORT_FILES=ON \ -DBUILD_LAYER_SUPPORT_FILES=ON \
-DSPIRV_TOOLS_LIB=/usr \
-DSPIRV_TOOLS_OPT_LIB=/usr \
-DSPIRV_HEADERS_INSTALL_DIR=/usr \ -DSPIRV_HEADERS_INSTALL_DIR=/usr \
-DGLSLANG_INSTALL_DIR=/usr \ -DGLSLANG_INSTALL_DIR=glslang/build/install \
" "
if get.buildTYPE() == "_emul32": if get.buildTYPE() == "_emul32":
@@ -61,7 +59,7 @@ def setup():
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
#shelltools.system("../scripts/update_deps.py") shelltools.system("../scripts/update_deps.py")
validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \ validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
-DCMAKE_ASM_FLAGS='--32' \ -DCMAKE_ASM_FLAGS='--32' \
" "
@@ -81,7 +79,7 @@ def setup():
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
#shelltools.system("../scripts/update_deps.py") shelltools.system("../scripts/update_deps.py")
validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \ validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
" "
+3 -3
View File
@@ -24,11 +24,11 @@
<Dependency>git</Dependency> <Dependency>git</Dependency>
<Dependency>spirv-headers</Dependency> <Dependency>spirv-headers</Dependency>
<Dependency>glslang-devel</Dependency> <!-- <Dependency>glslang-devel</Dependency> -->
<Dependency>wayland-server</Dependency> <Dependency>wayland-server</Dependency>
<Dependency>wayland-client</Dependency> <Dependency>wayland-client</Dependency>
<Dependency>wayland-cursor</Dependency> <Dependency>wayland-cursor</Dependency>
<Dependency>spirv-tools-devel</Dependency> <!-- <Dependency>spirv-tools-devel</Dependency> -->
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -56,7 +56,7 @@
<Dependency>libX11-32bit</Dependency> <Dependency>libX11-32bit</Dependency>
<Dependency>libXrandr-32bit</Dependency> <Dependency>libXrandr-32bit</Dependency>
<Dependency>wayland-32bit</Dependency> <Dependency>wayland-32bit</Dependency>
<Dependency>spirv-tools-32bit</Dependency> <!-- <Dependency>spirv-tools-32bit</Dependency> -->
</BuildDependencies> </BuildDependencies>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libX11-32bit</Dependency> <Dependency>libX11-32bit</Dependency>