Skip to content

Commit 501b456

Browse files
Merge pull request #16 from ReferenceType/develop
Develop
2 parents 377d35c + 21b2dd8 commit 501b456

File tree

89 files changed

+51082
-3926
lines changed

Some content is hidden

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

89 files changed

+51082
-3926
lines changed

CMakePresets.json

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"binaryDir": "${sourceDir}/out/build/${presetName}",
99
"installDir": "${sourceDir}/out/install/${presetName}",
1010
"cacheVariables": {
11-
"CMAKE_C_COMPILER": "cl.exe",
12-
"CMAKE_CXX_COMPILER": "cl.exe"
11+
"CMAKE_C_COMPILER": "C:/Program Files/LLVM/bin/clang.exe",
12+
"CMAKE_CXX_COMPILER": "C:/Program Files/LLVM/bin/clang++.exe"
1313
},
1414
"condition": {
1515
"type": "equals",
@@ -57,6 +57,40 @@
5757
"CMAKE_BUILD_TYPE": "Release"
5858
}
5959
},
60+
//{
61+
// "name": "android-arm64-release",
62+
// "displayName": "Android ARM64 Release",
63+
// "generator": "Ninja",
64+
// "binaryDir": "${sourceDir}/out/build/${presetName}",
65+
// "installDir": "${sourceDir}/out/install/${presetName}",
66+
// "cacheVariables": {
67+
// "CMAKE_SYSTEM_NAME": "Android",
68+
// "CMAKE_SYSTEM_VERSION": "21",
69+
// "CMAKE_ANDROID_ARCH_ABI": "arm64-v8a",
70+
// "CMAKE_ANDROID_NDK": "C:/Microsoft/AndroidNDK/android-ndk-r23c",
71+
// "CMAKE_ANDROID_STL_TYPE": "c++_static",
72+
// "CMAKE_C_COMPILER": "C:/Microsoft/AndroidNDK/android-ndk-r23c/toolchains/llvm/prebuilt/windows-x86_64/bin/aarch64-linux-android21-clang",
73+
// "CMAKE_CXX_COMPILER": "C:/Microsoft/AndroidNDK/android-ndk-r23c/toolchains/llvm/prebuilt/windows-x86_64/bin/aarch64-linux-android21-clang++",
74+
// "CMAKE_BUILD_TYPE": "Release"
75+
// }
76+
//},
77+
//{
78+
// "name": "android-arm32-release",
79+
// "displayName": "Android ARM32 Release",
80+
// "generator": "Ninja",
81+
// "binaryDir": "${sourceDir}/out/build/${presetName}",
82+
// "installDir": "${sourceDir}/out/install/${presetName}",
83+
// "cacheVariables": {
84+
// "CMAKE_SYSTEM_NAME": "Android",
85+
// "CMAKE_SYSTEM_VERSION": "21",
86+
// "CMAKE_ANDROID_ARCH_ABI": "armeabi-v7a",
87+
// "CMAKE_ANDROID_NDK": "C:/Microsoft/AndroidNDK/android-ndk-r23c",
88+
// "CMAKE_ANDROID_STL_TYPE": "c++_static",
89+
// "CMAKE_C_COMPILER": "C:/Microsoft/AndroidNDK/android-ndk-r23c/toolchains/llvm/prebuilt/windows-x86_64/bin/armv7a-linux-androideabi21-clang",
90+
// "CMAKE_CXX_COMPILER": "C:/Microsoft/AndroidNDK/android-ndk-r23c/toolchains/llvm/prebuilt/windows-x86_64/bin/armv7a-linux-androideabi21-clang++",
91+
// "CMAKE_BUILD_TYPE": "Release"
92+
// }
93+
//},
6094
{
6195
"name": "linux-debug",
6296
"displayName": "Linux Debug",

0 commit comments

Comments
 (0)