Skip to content

Commit f561b93

Browse files
rbessemsrbessems
authored
Fix archives and intro text. (#149)
* Update the download archives * Fixed Tutorial text to correctly specify minimum cmake version as 3.28.3
1 parent c2f5989 commit f561b93

11 files changed

Lines changed: 37 additions & 261 deletions

‎build-android-arch.bat‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎build-common-archs.bat‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎build-common-archs.sh‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ do
1717
Common/GraphicsAPI_D3D11.h \
1818
Common/HelperFunctions.h \
1919
Common/OpenXRDebugUtils.h \
20-
Common/OpenXRHelper.h
20+
Common/OpenXRHelper.h \
21+
thirdparty/glwrapper
2122
fi
2223
if [[ "$api" == "D3D12" ]]; then
2324
# D3D12
@@ -31,7 +32,8 @@ do
3132
Common/GraphicsAPI_D3D12.h \
3233
Common/HelperFunctions.h \
3334
Common/OpenXRDebugUtils.h \
34-
Common/OpenXRHelper.h
35+
Common/OpenXRHelper.h \
36+
thirdparty/glwrapper
3537
fi
3638
if [[ "$api" == "OPENGL" ]]; then
3739
# OPENGL
@@ -45,7 +47,8 @@ do
4547
Common/GraphicsAPI_OpenGL.h \
4648
Common/HelperFunctions.h \
4749
Common/OpenXRDebugUtils.h \
48-
Common/OpenXRHelper.h
50+
Common/OpenXRHelper.h \
51+
thirdparty/glwrapper
4952
fi
5053
if [[ "$api" == "OPENGL_ES" ]]; then
5154
# OPENGL_ES
@@ -59,7 +62,8 @@ do
5962
Common/GraphicsAPI_OpenGL_ES.h \
6063
Common/HelperFunctions.h \
6164
Common/OpenXRDebugUtils.h \
62-
Common/OpenXRHelper.h
65+
Common/OpenXRHelper.h \
66+
thirdparty/glwrapper
6367
fi
6468
if [[ "$api" == "VULKAN" ]]; then
6569
# VULKAN
@@ -73,7 +77,8 @@ do
7377
Common/GraphicsAPI_Vulkan.h \
7478
Common/HelperFunctions.h \
7579
Common/OpenXRDebugUtils.h \
76-
Common/OpenXRHelper.h
80+
Common/OpenXRHelper.h \
81+
thirdparty/glwrapper
7782
fi
7883
done
7984

@@ -97,3 +102,4 @@ zip -r build/common_archs/Common.zip \
97102
Common/HelperFunctions.h \
98103
Common/OpenXRDebugUtils.h \
99104
Common/OpenXRHelper.h \
105+
thirdparty/glwrapper

‎build-eoc-archs.bat‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎build-eoc-archs.sh‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
#!/bin/bash
22

33
#Make destination folders
4-
mkdir -p build/eoc_archs/Chapter1
5-
mkdir -p build/eoc_archs/Chapter2
6-
mkdir -p build/eoc_archs/Chapter3
7-
mkdir -p build/eoc_archs/Chapter4
8-
mkdir -p build/eoc_archs/Chapter5
94
mkdir -p build/eoc_archs/cmake
105
mkdir -p build/eoc_archs/Common
116
mkdir -p build/eoc_archs/Shaders
7+
mkdir -p build/eoc_archs/thirdparty/glwrapper
128

139
#Copy the required files and folder to the eoc_archs folder
14-
cp Chapter1/main.cpp Chapter1/CMakeLists.txt build/eoc_archs/Chapter1
15-
cp Chapter2/main.cpp Chapter2/CMakeLists.txt build/eoc_archs/Chapter2
16-
cp Chapter3/main.cpp Chapter3/CMakeLists.txt build/eoc_archs/Chapter3
17-
cp Chapter4/main.cpp Chapter4/CMakeLists.txt build/eoc_archs/Chapter4
18-
cp Chapter5/main.cpp Chapter5/CMakeLists.txt build/eoc_archs/Chapter5
10+
11+
for chapter in Chapter1 Chapter2 Chapter3 Chapter4 Chapter5; do
12+
mkdir -p build/eoc_archs/$chapter/app/src
13+
cp -r $chapter/main.cpp $chapter/CMakeLists.txt build/eoc_archs/$chapter
14+
cp -r $chapter/build.gradle $chapter/gradle* $chapter/settings.gradle build/eoc_archs/$chapter
15+
cp -r $chapter/app/build.gradle $chapter/app/proguard-rules.pro $chapter/app/src build/eoc_archs/$chapter/app
16+
done
1917
cp -r cmake build/eoc_archs
2018
cp -r Common build/eoc_archs
2119
cp -r Shaders build/eoc_archs
20+
cp -r thirdparty/glwrapper build/eoc_archs/thirdparty
21+
22+
23+
2224

2325
#Remove XR_DOCS_TAG_ lines from files
2426
python eoc-archs-rm-tags.py -f build/eoc_archs/Chapter1/main.cpp
@@ -50,19 +52,19 @@ python eoc-archs-rm-tags.py -f build/eoc_archs/Common/OpenXRHelper.h
5052
#Zip the folders
5153
pushd build/eoc_archs
5254
cp -f ./../../thirdparty/CMakeLists_Ch1_Main.txt CMakeLists.txt
53-
zip -r Chapter1.zip Chapter1 CMakeLists.txt cmake Common
55+
zip -r Chapter1.zip Chapter1 CMakeLists.txt cmake Common thirdparty
5456

5557
cp -f ./../../thirdparty/CMakeLists_Ch2_Main.txt CMakeLists.txt
56-
zip -r Chapter2.zip Chapter2 CMakeLists.txt cmake Common
58+
zip -r Chapter2.zip Chapter2 CMakeLists.txt cmake Common thirdparty
5759

5860
cp -f ./../../thirdparty/CMakeLists_Ch3_Main.txt CMakeLists.txt
59-
zip -r Chapter3.zip Chapter3 CMakeLists.txt cmake Common Shaders
61+
zip -r Chapter3.zip Chapter3 CMakeLists.txt cmake Common Shaders thirdparty
6062

6163
cp -f ./../../thirdparty/CMakeLists_Ch4_Main.txt CMakeLists.txt
62-
zip -r Chapter4.zip Chapter4 CMakeLists.txt cmake Common Shaders
64+
zip -r Chapter4.zip Chapter4 CMakeLists.txt cmake Common Shaders thirdparty
6365

6466
cp -f ./../../thirdparty/CMakeLists_Ch5_Main.txt CMakeLists.txt
65-
zip -r Chapter5.zip Chapter5 CMakeLists.txt cmake Common Shaders
67+
zip -r Chapter5.zip Chapter5 CMakeLists.txt cmake Common Shaders thirdparty
6668
popd
6769

6870
#Remove destination file and folders
@@ -74,4 +76,5 @@ rm -rf build/eoc_archs/Chapter5
7476
rm -rf build/eoc_archs/cmake
7577
rm -rf build/eoc_archs/Common
7678
rm -rf build/eoc_archs/Shaders
79+
rm -rf build/eoc_archs/thirdparty
7780
rm build/eoc_archs/CMakeLists.txt

‎thirdparty/CMakeLists_Ch1_Main.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
cmake_minimum_required(VERSION 3.22.1)
5+
cmake_minimum_required(VERSION 3.28.3)
66

77
project(openxr-tutorial)
88

‎thirdparty/CMakeLists_Ch2_Main.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
cmake_minimum_required(VERSION 3.22.1)
5+
cmake_minimum_required(VERSION 3.28.3)
66

77
project(openxr-tutorial)
88

‎thirdparty/CMakeLists_Ch3_Main.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
cmake_minimum_required(VERSION 3.22.1)
5+
cmake_minimum_required(VERSION 3.28.3)
66

77
project(openxr-tutorial)
88

‎thirdparty/CMakeLists_Ch4_Main.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
cmake_minimum_required(VERSION 3.22.1)
5+
cmake_minimum_required(VERSION 3.28.3)
66

77
project(openxr-tutorial)
88

0 commit comments

Comments
 (0)