Skip to content

Commit 986000b

Browse files
committed
Version 1.0.5
1 parent 9dda8ea commit 986000b

File tree

117 files changed

+102
-860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+102
-860
lines changed

Android/appdimens_games/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ android {
109109
cmake {
110110
cppFlags += listOf("-std=c++17", "-frtti", "-fexceptions")
111111
arguments += listOf("-DANDROID_STL=c++_shared")
112-
version = "4.1.1"
113112
}
114113
}
115114
}
@@ -147,8 +146,8 @@ android {
147146
externalNativeBuild {
148147
cmake {
149148
path = file("src/main/cpp/CMakeLists.txt")
150-
// Use CMake 4.1.1 from Android SDK
151-
version = "4.1.1"
149+
// Use CMake 3.22.1 which is available on JitPack
150+
version = "3.22.1"
152151
}
153152
}
154153

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,2 @@
11
ninja: Entering directory `/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a'
2-
[1/7] Building CXX object CMakeFiles/appdimens_games.dir/src/GameScaling.cpp.o
3-
In file included from <built-in>:464:
4-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
5-
2 | #define __ANDROID_API__ 23
6-
| ^
7-
<built-in>:455:9: note: previous definition is here
8-
455 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
9-
| ^
10-
1 warning generated.
11-
[2/7] Building CXX object CMakeFiles/appdimens_games.dir/src/GameMath.cpp.o
12-
In file included from <built-in>:464:
13-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
14-
2 | #define __ANDROID_API__ 23
15-
| ^
16-
<built-in>:455:9: note: previous definition is here
17-
455 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
18-
| ^
19-
1 warning generated.
20-
[3/7] Building CXX object CMakeFiles/appdimens_games.dir/src/ViewportManager.cpp.o
21-
In file included from <built-in>:464:
22-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
23-
2 | #define __ANDROID_API__ 23
24-
| ^
25-
<built-in>:455:9: note: previous definition is here
26-
455 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
27-
| ^
28-
1 warning generated.
29-
[4/7] Building CXX object CMakeFiles/appdimens_games.dir/src/GameDimensions.cpp.o
30-
In file included from <built-in>:464:
31-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
32-
2 | #define __ANDROID_API__ 23
33-
| ^
34-
<built-in>:455:9: note: previous definition is here
35-
455 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
36-
| ^
37-
1 warning generated.
38-
[5/7] Building CXX object CMakeFiles/appdimens_games.dir/src/OpenGLUtils.cpp.o
39-
In file included from <built-in>:464:
40-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
41-
2 | #define __ANDROID_API__ 23
42-
| ^
43-
<built-in>:455:9: note: previous definition is here
44-
455 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
45-
| ^
46-
1 warning generated.
47-
[6/7] Building CXX object CMakeFiles/appdimens_games.dir/src/PerformanceMonitor.cpp.o
48-
In file included from <built-in>:464:
49-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
50-
2 | #define __ANDROID_API__ 23
51-
| ^
52-
<built-in>:455:9: note: previous definition is here
53-
455 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
54-
| ^
55-
1 warning generated.
56-
[7/7] Linking CXX shared library /home/bodenberg/Downloads/AppDimens/Android/appdimens_games/build/intermediates/cxx/Debug/5g5v3a33/obj/arm64-v8a/libappdimens_games.so
2+
ninja: no work to do.
Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,3 @@
1-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
2-
Compatibility with CMake < 3.10 will be removed from a future version of
3-
CMake.
4-
5-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
6-
to tell CMake that the project requires at least <min> but has been updated
7-
to work with policies introduced by <max> or earlier.
8-
Call Stack (most recent call first):
9-
/home/bodenberg/Android/Sdk/cmake/4.1.1/share/cmake-4.1/Modules/CMakeDetermineSystem.cmake:146 (include)
10-
CMakeLists.txt:4 (project)
11-
12-
13-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android-legacy.toolchain.cmake:35 (cmake_minimum_required):
14-
Compatibility with CMake < 3.10 will be removed from a future version of
15-
CMake.
16-
17-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
18-
to tell CMake that the project requires at least <min> but has been updated
19-
to work with policies introduced by <max> or earlier.
20-
Call Stack (most recent call first):
21-
/home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:55 (include)
22-
/home/bodenberg/Android/Sdk/cmake/4.1.1/share/cmake-4.1/Modules/CMakeDetermineSystem.cmake:146 (include)
23-
CMakeLists.txt:4 (project)
24-
25-
261
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
272
Compatibility with CMake < 3.10 will be removed from a future version of
283
CMake.
@@ -35,18 +10,6 @@ Call Stack (most recent call first):
3510
CMakeLists.txt:4 (project)
3611

3712

38-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
39-
Compatibility with CMake < 3.10 will be removed from a future version of
40-
CMake.
41-
42-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
43-
to tell CMake that the project requires at least <min> but has been updated
44-
to work with policies introduced by <max> or earlier.
45-
Call Stack (most recent call first):
46-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
47-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/CMakeScratch/TryCompile-xnWiKZ/CMakeLists.txt:4 (project)
48-
49-
5013
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android-legacy.toolchain.cmake:35 (cmake_minimum_required):
5114
Compatibility with CMake < 3.10 will be removed from a future version of
5215
CMake.
@@ -57,31 +20,6 @@ CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build
5720
Call Stack (most recent call first):
5821
/home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:55 (include)
5922
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
60-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/CMakeScratch/TryCompile-xnWiKZ/CMakeLists.txt:4 (project)
61-
62-
63-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
64-
Compatibility with CMake < 3.10 will be removed from a future version of
65-
CMake.
66-
67-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
68-
to tell CMake that the project requires at least <min> but has been updated
69-
to work with policies introduced by <max> or earlier.
70-
Call Stack (most recent call first):
71-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
72-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/CMakeScratch/TryCompile-gbOZVK/CMakeLists.txt:4 (project)
73-
74-
75-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android-legacy.toolchain.cmake:35 (cmake_minimum_required):
76-
Compatibility with CMake < 3.10 will be removed from a future version of
77-
CMake.
78-
79-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
80-
to tell CMake that the project requires at least <min> but has been updated
81-
to work with policies introduced by <max> or earlier.
82-
Call Stack (most recent call first):
83-
/home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:55 (include)
84-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
85-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a/CMakeFiles/CMakeScratch/TryCompile-gbOZVK/CMakeLists.txt:4 (project)
23+
CMakeLists.txt:4 (project)
8624

8725

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
-- The C compiler identification is Clang 18.0.1
2-
-- The CXX compiler identification is Clang 18.0.1
3-
-- Detecting C compiler ABI info
4-
-- Detecting C compiler ABI info - done
5-
-- Check for working C compiler: /home/bodenberg/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/clang - skipped
6-
-- Detecting C compile features
7-
-- Detecting C compile features - done
8-
-- Detecting CXX compiler ABI info
9-
-- Detecting CXX compiler ABI info - done
10-
-- Check for working CXX compiler: /home/bodenberg/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ - skipped
11-
-- Detecting CXX compile features
12-
-- Detecting CXX compile features - done
13-
-- Configuring done (0.2s)
1+
-- Configuring done (0.0s)
142
-- Generating done (0.0s)
153
-- Build files have been written to: /home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/arm64-v8a
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# C/C++ build system timings
2+
generate_cxx_metadata
3+
execute-generate-process
4+
exec-configure 23ms
5+
execute-generate-process completed in 27ms
6+
generate_cxx_metadata completed in 30ms
7+
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# C/C++ build system timings
2+
Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,2 @@
11
ninja: Entering directory `/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a'
2-
[1/7] Building CXX object CMakeFiles/appdimens_games.dir/src/GameScaling.cpp.o
3-
In file included from <built-in>:467:
4-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
5-
2 | #define __ANDROID_API__ 23
6-
| ^
7-
<built-in>:458:9: note: previous definition is here
8-
458 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
9-
| ^
10-
1 warning generated.
11-
[2/7] Building CXX object CMakeFiles/appdimens_games.dir/src/ViewportManager.cpp.o
12-
In file included from <built-in>:467:
13-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
14-
2 | #define __ANDROID_API__ 23
15-
| ^
16-
<built-in>:458:9: note: previous definition is here
17-
458 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
18-
| ^
19-
1 warning generated.
20-
[3/7] Building CXX object CMakeFiles/appdimens_games.dir/src/GameMath.cpp.o
21-
In file included from <built-in>:467:
22-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
23-
2 | #define __ANDROID_API__ 23
24-
| ^
25-
<built-in>:458:9: note: previous definition is here
26-
458 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
27-
| ^
28-
1 warning generated.
29-
[4/7] Building CXX object CMakeFiles/appdimens_games.dir/src/GameDimensions.cpp.o
30-
In file included from <built-in>:467:
31-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
32-
2 | #define __ANDROID_API__ 23
33-
| ^
34-
<built-in>:458:9: note: previous definition is here
35-
458 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
36-
| ^
37-
1 warning generated.
38-
[5/7] Building CXX object CMakeFiles/appdimens_games.dir/src/OpenGLUtils.cpp.o
39-
In file included from <built-in>:467:
40-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
41-
2 | #define __ANDROID_API__ 23
42-
| ^
43-
<built-in>:458:9: note: previous definition is here
44-
458 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
45-
| ^
46-
1 warning generated.
47-
[6/7] Building CXX object CMakeFiles/appdimens_games.dir/src/PerformanceMonitor.cpp.o
48-
In file included from <built-in>:467:
49-
<command line>:2:9: warning: '__ANDROID_API__' macro redefined [-Wmacro-redefined]
50-
2 | #define __ANDROID_API__ 23
51-
| ^
52-
<built-in>:458:9: note: previous definition is here
53-
458 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
54-
| ^
55-
1 warning generated.
56-
[7/7] Linking CXX shared library /home/bodenberg/Downloads/AppDimens/Android/appdimens_games/build/intermediates/cxx/Debug/5g5v3a33/obj/armeabi-v7a/libappdimens_games.so
2+
ninja: no work to do.
Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,3 @@
1-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
2-
Compatibility with CMake < 3.10 will be removed from a future version of
3-
CMake.
4-
5-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
6-
to tell CMake that the project requires at least <min> but has been updated
7-
to work with policies introduced by <max> or earlier.
8-
Call Stack (most recent call first):
9-
/home/bodenberg/Android/Sdk/cmake/4.1.1/share/cmake-4.1/Modules/CMakeDetermineSystem.cmake:146 (include)
10-
CMakeLists.txt:4 (project)
11-
12-
13-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android-legacy.toolchain.cmake:35 (cmake_minimum_required):
14-
Compatibility with CMake < 3.10 will be removed from a future version of
15-
CMake.
16-
17-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
18-
to tell CMake that the project requires at least <min> but has been updated
19-
to work with policies introduced by <max> or earlier.
20-
Call Stack (most recent call first):
21-
/home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:55 (include)
22-
/home/bodenberg/Android/Sdk/cmake/4.1.1/share/cmake-4.1/Modules/CMakeDetermineSystem.cmake:146 (include)
23-
CMakeLists.txt:4 (project)
24-
25-
261
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
272
Compatibility with CMake < 3.10 will be removed from a future version of
283
CMake.
@@ -35,18 +10,6 @@ Call Stack (most recent call first):
3510
CMakeLists.txt:4 (project)
3611

3712

38-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
39-
Compatibility with CMake < 3.10 will be removed from a future version of
40-
CMake.
41-
42-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
43-
to tell CMake that the project requires at least <min> but has been updated
44-
to work with policies introduced by <max> or earlier.
45-
Call Stack (most recent call first):
46-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
47-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/CMakeScratch/TryCompile-WeXwFM/CMakeLists.txt:4 (project)
48-
49-
5013
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android-legacy.toolchain.cmake:35 (cmake_minimum_required):
5114
Compatibility with CMake < 3.10 will be removed from a future version of
5215
CMake.
@@ -57,31 +20,6 @@ CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build
5720
Call Stack (most recent call first):
5821
/home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:55 (include)
5922
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
60-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/CMakeScratch/TryCompile-WeXwFM/CMakeLists.txt:4 (project)
61-
62-
63-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:35 (cmake_minimum_required):
64-
Compatibility with CMake < 3.10 will be removed from a future version of
65-
CMake.
66-
67-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
68-
to tell CMake that the project requires at least <min> but has been updated
69-
to work with policies introduced by <max> or earlier.
70-
Call Stack (most recent call first):
71-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
72-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/CMakeScratch/TryCompile-l9yQQm/CMakeLists.txt:4 (project)
73-
74-
75-
CMake Deprecation Warning at /home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android-legacy.toolchain.cmake:35 (cmake_minimum_required):
76-
Compatibility with CMake < 3.10 will be removed from a future version of
77-
CMake.
78-
79-
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
80-
to tell CMake that the project requires at least <min> but has been updated
81-
to work with policies introduced by <max> or earlier.
82-
Call Stack (most recent call first):
83-
/home/bodenberg/Android/Sdk/ndk/27.0.12077973/build/cmake/android.toolchain.cmake:55 (include)
84-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/4.1.1/CMakeSystem.cmake:6 (include)
85-
/home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a/CMakeFiles/CMakeScratch/TryCompile-l9yQQm/CMakeLists.txt:4 (project)
23+
CMakeLists.txt:4 (project)
8624

8725

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
-- The C compiler identification is Clang 18.0.1
2-
-- The CXX compiler identification is Clang 18.0.1
3-
-- Detecting C compiler ABI info
4-
-- Detecting C compiler ABI info - done
5-
-- Check for working C compiler: /home/bodenberg/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/clang - skipped
6-
-- Detecting C compile features
7-
-- Detecting C compile features - done
8-
-- Detecting CXX compiler ABI info
9-
-- Detecting CXX compiler ABI info - done
10-
-- Check for working CXX compiler: /home/bodenberg/Android/Sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ - skipped
11-
-- Detecting CXX compile features
12-
-- Detecting CXX compile features - done
13-
-- Configuring done (0.2s)
1+
-- Configuring done (0.0s)
142
-- Generating done (0.0s)
153
-- Build files have been written to: /home/bodenberg/Downloads/AppDimens/Android/appdimens_games/.cxx/Debug/5g5v3a33/armeabi-v7a
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# C/C++ build system timings
2+
generate_cxx_metadata
3+
execute-generate-process
4+
exec-configure 28ms
5+
execute-generate-process completed in 32ms
6+
generate_cxx_metadata completed in 34ms
7+

0 commit comments

Comments
 (0)