Skip to content
Snippets Groups Projects
Commit 7b3ff541 authored by Oz Linden's avatar Oz Linden
Browse files

make build.sh use the same build directory that autobuild.xml uses on Windows

parent 4eca1769
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
build.sh
+ 3
− 3
View file @ 7b3ff541
...@@ -28,7 +28,7 @@ build_dir_Linux() ...@@ -28,7 +28,7 @@ build_dir_Linux()
build_dir_CYGWIN() build_dir_CYGWIN()
{ {
echo build-vc120 echo build-vc120-${AUTOBUILD_ADDRSIZE}
} }
viewer_channel_suffix() viewer_channel_suffix()
...@@ -114,6 +114,7 @@ package_llphysicsextensions_tpv() ...@@ -114,6 +114,7 @@ package_llphysicsextensions_tpv()
tpv_status=0 tpv_status=0
if [ "$variant" = "Release" ] if [ "$variant" = "Release" ]
then then
test -r "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml" || fatal "No llphysicsextensions_tpv autobuild configuration found"
tpvconfig=$(native_path "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml") tpvconfig=$(native_path "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml")
"$autobuild" build --quiet --config-file "$tpvconfig" -c Tpv || fatal "failed to build llphysicsextensions_tpv" "$autobuild" build --quiet --config-file "$tpvconfig" -c Tpv || fatal "failed to build llphysicsextensions_tpv"
...@@ -159,8 +160,7 @@ build() ...@@ -159,8 +160,7 @@ build()
fi fi
# *TODO: Make this a build extension. # *TODO: Make this a build extension.
# HACK: remove this temporarily to unblock viewer64 builds for others package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
# package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
end_section "extensions $variant" end_section "extensions $variant"
else else
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment