diff --git a/.gitmodules b/.gitmodules index 935efb3..e7a2906 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,8 @@ path = vulkan/modules/vkBasalt url = https://github.com/wheaney/vkBasalt.git branch = runtime_uniforms -[submodule "modules/xrealAirLinuxDriver"] - path = modules/xrealAirLinuxDriver +[submodule "modules/XRLinuxDriver"] + path = modules/XRLinuxDriver url = https://github.com/wheaney/XRLinuxDriver.git [submodule "modules/sombrero"] path = modules/sombrero diff --git a/bin/package_gnome b/bin/package_gnome index 65c8bfe..7a17003 100755 --- a/bin/package_gnome +++ b/bin/package_gnome @@ -17,7 +17,7 @@ PACKAGE_DIR=$GNOME_BUILD_DIR/breezy_gnome rm -rf $PACKAGE_DIR mkdir -p $PACKAGE_DIR -XREAL_DRIVER_DIR=$ROOT_DIR/modules/xrealAirLinuxDriver +XREAL_DRIVER_DIR=$ROOT_DIR/modules/XRLinuxDriver source $XREAL_DRIVER_DIR/bin/inject_ua # check out submodules, recursively for nested ones @@ -41,6 +41,9 @@ if [ ! -e "$XREAL_BINARY" ] || [ "$1" != "--skip-module-builds" ]; then cp $VULKAN_DIR/custom_banner_config.yml $XREAL_DRIVER_DIR fi + # strange issue where the base library produces a .so file if the build is not cleaned + rm -rf build/ + BREEZY_DESKTOP=1 bin/package fi diff --git a/bin/package_vulkan b/bin/package_vulkan index 0b12c32..0b70169 100755 --- a/bin/package_vulkan +++ b/bin/package_vulkan @@ -3,7 +3,7 @@ # exit when any command fails set -e -XREAL_DRIVER_DIR=modules/xrealAirLinuxDriver +XREAL_DRIVER_DIR=modules/XRLinuxDriver source $XREAL_DRIVER_DIR/bin/inject_ua # check out submodules, recursively for nested ones @@ -66,6 +66,10 @@ if [ ! -e "$XREAL_BINARY" ] || [ "$1" != "--skip-module-builds" ]; then fi pushd $XREAL_DRIVER_DIR + + # strange issue where the base library produces a .so file if the build is not cleaned + rm -rf build/ + bin/package else pushd $XREAL_DRIVER_DIR diff --git a/modules/XRLinuxDriver b/modules/XRLinuxDriver new file mode 160000 index 0000000..da9bfe1 --- /dev/null +++ b/modules/XRLinuxDriver @@ -0,0 +1 @@ +Subproject commit da9bfe14cdf198b3cd58ecf997324ebd358e8a61 diff --git a/modules/xrealAirLinuxDriver b/modules/xrealAirLinuxDriver deleted file mode 160000 index 4e3f653..0000000 --- a/modules/xrealAirLinuxDriver +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4e3f653d71dc4dca36a8f45c376ee9d853fb6b66