omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update android project and link issue because previously removed the app_dummy

Browse Source
This commit is contained in:
omigamedev
2018-10-09 13:05:26 +02:00
parent b4c986d273
commit f3f22bdd85
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ add_library(
# automatically packages shared libraries with your APK. # automatically packages shared libraries with your APK.
# now build app's shared lib # now build app's shared lib
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
add_library( add_library(
native-lib SHARED native-lib SHARED

14
android/build.gradle
View File

@@ -27,15 +27,13 @@ apply plugin: "com.gladed.androidgitversion"
def getCurrentFlavor() { def getCurrentFlavor() {
Gradle gradle = getGradle() Gradle gradle = getGradle()
if (gradle.getStartParameter().getTaskRequests().args.size() == 0) if (gradle.getStartParameter().getTaskRequests().args.size() == 0)
return "" return ""
String tskReqStr = gradle.getStartParameter().getTaskRequests().args[0][0] String tskReqStr = gradle.getStartParameter().getTaskRequests().args[0][0]
Pattern pattern; Pattern pattern
if( tskReqStr.contains( "assemble" ) ) pattern = Pattern.compile("(\\w*)(Release|Debug)")
pattern = Pattern.compile("assemble(\\w*)(Release|Debug)")
else
pattern = Pattern.compile("generate(\\w*)(Release|Debug)")
Matcher matcher = pattern.matcher( tskReqStr ) Matcher matcher = pattern.matcher( tskReqStr )
@@ -44,7 +42,7 @@ def getCurrentFlavor() {
else else
{ {
println "NO MATCH FOUND" println "NO MATCH FOUND"
return ""; return ""
} }
} }
@@ -54,7 +52,7 @@ def flavor_cap = getCurrentFlavor().capitalize()
Properties properties = new Properties() Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream()) properties.load(project.rootProject.file('local.properties').newDataInputStream())
def sdkDir = properties.getProperty("sdk.dir") def sdkDir = properties.getProperty("sdk.dir")
def classpath = "build/intermediates/javac/${flavor}/compile${flavor_cap}JavaWithJavac/classes:${sdkDir}/platforms/android-26/android.jar" def classpath = "build/intermediates/javac/${flavor}/compile${flavor_cap}JavaWithJavac/classes;${sdkDir}/platforms/android-26/android.jar"
def activity = "com.omixlab.panopainter.MainActivity" def activity = "com.omixlab.panopainter.MainActivity"
def outpath = "src/main/cpp" def outpath = "src/main/cpp"
@@ -88,7 +86,7 @@ android {
//cppFlags "-D__STDC_FORMAT_MACROS" //cppFlags "-D__STDC_FORMAT_MACROS"
arguments "-DANDROID_TOOLCHAIN=clang", arguments "-DANDROID_TOOLCHAIN=clang",
//"-DANDROID_PLATFORM=android-19", //"-DANDROID_PLATFORM=android-19",
"-DANDROID_STL=gnustl_static", "-DANDROID_STL=c++_shared",
"-DCMAKE_BUILD_TYPE=${flavor_cap}", "-DCMAKE_BUILD_TYPE=${flavor_cap}",
"-DANDROID_ARM_NEON=TRUE" "-DANDROID_ARM_NEON=TRUE"
} }

4
android/src/main/cpp/main.cpp
View File

@@ -941,6 +941,10 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
void android_main(struct android_app* state) { void android_main(struct android_app* state) {
struct engine engine; struct engine engine;
// Make sure glue isn't stripped.
// DON'T REMOVE, even if the compiler say it's deprecated
app_dummy();
memset(&engine, 0, sizeof(engine)); memset(&engine, 0, sizeof(engine));
state->userData = &engine; state->userData = &engine;
state->onAppCmd = engine_handle_cmd; state->onAppCmd = engine_handle_cmd;