Skip to content

Fix archives and intro text. #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbessems merged 2 commits into from
Jun 25, 2025
Merged

Fix archives and intro text. #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74004eb
Update the download archives
rbessems Jun 25, 2025
a903052
Fixed Tutorial text to correctly specify minimum cmake version as 3.28.3
rbessems Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions build-android-arch.bat
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions build-common-archs.bat
View file
Open in desktop

This file was deleted.

16 changes: 11 additions & 5 deletions build-common-archs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ do
Common/GraphicsAPI_D3D11.h \
Common/HelperFunctions.h \
Common/OpenXRDebugUtils.h \
Common/OpenXRHelper.h
Common/OpenXRHelper.h \
thirdparty/glwrapper
fi
if [[ "$api" == "D3D12" ]]; then
# D3D12
Expand All @@ -31,7 +32,8 @@ do
Common/GraphicsAPI_D3D12.h \
Common/HelperFunctions.h \
Common/OpenXRDebugUtils.h \
Common/OpenXRHelper.h
Common/OpenXRHelper.h \
thirdparty/glwrapper
fi
if [[ "$api" == "OPENGL" ]]; then
# OPENGL
Expand All @@ -45,7 +47,8 @@ do
Common/GraphicsAPI_OpenGL.h \
Common/HelperFunctions.h \
Common/OpenXRDebugUtils.h \
Common/OpenXRHelper.h
Common/OpenXRHelper.h \
thirdparty/glwrapper
fi
if [[ "$api" == "OPENGL_ES" ]]; then
# OPENGL_ES
Expand All @@ -59,7 +62,8 @@ do
Common/GraphicsAPI_OpenGL_ES.h \
Common/HelperFunctions.h \
Common/OpenXRDebugUtils.h \
Common/OpenXRHelper.h
Common/OpenXRHelper.h \
thirdparty/glwrapper
fi
if [[ "$api" == "VULKAN" ]]; then
# VULKAN
Expand All @@ -73,7 +77,8 @@ do
Common/GraphicsAPI_Vulkan.h \
Common/HelperFunctions.h \
Common/OpenXRDebugUtils.h \
Common/OpenXRHelper.h
Common/OpenXRHelper.h \
thirdparty/glwrapper
fi
done

Expand All @@ -97,3 +102,4 @@ zip -r build/common_archs/Common.zip \
Common/HelperFunctions.h \
Common/OpenXRDebugUtils.h \
Common/OpenXRHelper.h \
thirdparty/glwrapper
82 changes: 0 additions & 82 deletions build-eoc-archs.bat
View file
Open in desktop

This file was deleted.

33 changes: 18 additions & 15 deletions build-eoc-archs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
#!/bin/bash

#Make destination folders
mkdir -p build/eoc_archs/Chapter1
mkdir -p build/eoc_archs/Chapter2
mkdir -p build/eoc_archs/Chapter3
mkdir -p build/eoc_archs/Chapter4
mkdir -p build/eoc_archs/Chapter5
mkdir -p build/eoc_archs/cmake
mkdir -p build/eoc_archs/Common
mkdir -p build/eoc_archs/Shaders
mkdir -p build/eoc_archs/thirdparty/glwrapper

#Copy the required files and folder to the eoc_archs folder
cp Chapter1/main.cpp Chapter1/CMakeLists.txt build/eoc_archs/Chapter1
cp Chapter2/main.cpp Chapter2/CMakeLists.txt build/eoc_archs/Chapter2
cp Chapter3/main.cpp Chapter3/CMakeLists.txt build/eoc_archs/Chapter3
cp Chapter4/main.cpp Chapter4/CMakeLists.txt build/eoc_archs/Chapter4
cp Chapter5/main.cpp Chapter5/CMakeLists.txt build/eoc_archs/Chapter5

for chapter in Chapter1 Chapter2 Chapter3 Chapter4 Chapter5; do
mkdir -p build/eoc_archs/$chapter/app/src
cp -r $chapter/main.cpp $chapter/CMakeLists.txt build/eoc_archs/$chapter
cp -r $chapter/build.gradle $chapter/gradle* $chapter/settings.gradle build/eoc_archs/$chapter
cp -r $chapter/app/build.gradle $chapter/app/proguard-rules.pro $chapter/app/src build/eoc_archs/$chapter/app
done
cp -r cmake build/eoc_archs
cp -r Common build/eoc_archs
cp -r Shaders build/eoc_archs
cp -r thirdparty/glwrapper build/eoc_archs/thirdparty




#Remove XR_DOCS_TAG_ lines from files
python eoc-archs-rm-tags.py -f build/eoc_archs/Chapter1/main.cpp
Expand Down Expand Up @@ -50,19 +52,19 @@ python eoc-archs-rm-tags.py -f build/eoc_archs/Common/OpenXRHelper.h
#Zip the folders
pushd build/eoc_archs
cp -f ./../../thirdparty/CMakeLists_Ch1_Main.txt CMakeLists.txt
zip -r Chapter1.zip Chapter1 CMakeLists.txt cmake Common
zip -r Chapter1.zip Chapter1 CMakeLists.txt cmake Common thirdparty

cp -f ./../../thirdparty/CMakeLists_Ch2_Main.txt CMakeLists.txt
zip -r Chapter2.zip Chapter2 CMakeLists.txt cmake Common
zip -r Chapter2.zip Chapter2 CMakeLists.txt cmake Common thirdparty

cp -f ./../../thirdparty/CMakeLists_Ch3_Main.txt CMakeLists.txt
zip -r Chapter3.zip Chapter3 CMakeLists.txt cmake Common Shaders
zip -r Chapter3.zip Chapter3 CMakeLists.txt cmake Common Shaders thirdparty

cp -f ./../../thirdparty/CMakeLists_Ch4_Main.txt CMakeLists.txt
zip -r Chapter4.zip Chapter4 CMakeLists.txt cmake Common Shaders
zip -r Chapter4.zip Chapter4 CMakeLists.txt cmake Common Shaders thirdparty

cp -f ./../../thirdparty/CMakeLists_Ch5_Main.txt CMakeLists.txt
zip -r Chapter5.zip Chapter5 CMakeLists.txt cmake Common Shaders
zip -r Chapter5.zip Chapter5 CMakeLists.txt cmake Common Shaders thirdparty
popd

#Remove destination file and folders
Expand All @@ -74,4 +76,5 @@ rm -rf build/eoc_archs/Chapter5
rm -rf build/eoc_archs/cmake
rm -rf build/eoc_archs/Common
rm -rf build/eoc_archs/Shaders
rm -rf build/eoc_archs/thirdparty
rm build/eoc_archs/CMakeLists.txt
2 changes: 1 addition & 1 deletion thirdparty/CMakeLists_Ch1_Main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.22.1)
cmake_minimum_required(VERSION 3.28.3)

project(openxr-tutorial)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/CMakeLists_Ch2_Main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.22.1)
cmake_minimum_required(VERSION 3.28.3)

project(openxr-tutorial)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/CMakeLists_Ch3_Main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.22.1)
cmake_minimum_required(VERSION 3.28.3)

project(openxr-tutorial)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/CMakeLists_Ch4_Main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.22.1)
cmake_minimum_required(VERSION 3.28.3)

project(openxr-tutorial)

Expand Down
Loading