mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
Merge #5495
5495: Fix Android build r=heinrich5991 a=Jupeyy - Video recorder off - small fix in logger.cpp Tested on Java-17 ## Checklist - [ ] Tested the change ingame - [ ] Provided screenshots if it is a visual change - [ ] Tested in combination with possibly related configuration options - [ ] Written a unit test if it works standalone, system.c especially - [ ] Considered possible null pointers and out of bounds array indexing - [ ] Changed no physics that affect existing maps - [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional) Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
commit
937a9cc0e2
|
@ -104,8 +104,8 @@ function build_for_type() {
|
|||
-DTOOLS=OFF \
|
||||
-DDEV=TRUE \
|
||||
-DCMAKE_CROSSCOMPILING=ON \
|
||||
-DPREFER_BUNDLED_LIBS=ON \
|
||||
-DVULKAN=ON
|
||||
-DVULKAN=ON \
|
||||
-DVIDEORECORDER=OFF
|
||||
(
|
||||
cd "build_android/$_ANDROID_SUB_BUILD_DIR/$1" || exit 1
|
||||
cmake --build . --target DDNet
|
||||
|
|
|
@ -10,7 +10,7 @@ buildscript {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.2.0'
|
||||
classpath 'com.android.tools.build:gradle:7.2.1'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -162,7 +162,7 @@ public:
|
|||
void Log(const CLogMessage *pMessage) override
|
||||
{
|
||||
int AndroidLevel;
|
||||
switch(Level)
|
||||
switch(pMessage->m_Level)
|
||||
{
|
||||
case LEVEL_TRACE: AndroidLevel = ANDROID_LOG_VERBOSE; break;
|
||||
case LEVEL_DEBUG: AndroidLevel = ANDROID_LOG_DEBUG; break;
|
||||
|
|
Loading…
Reference in a new issue