Merge pull request #13 from marmistrz/master

Fix various build issues
namndev · Jun 24, 2020 · 00c98db · 00c98db
2 parents c7e24bb + b92b17f
commit 00c98db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/qDict/build.gradle b/qDict/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 20191029
         externalNativeBuild {
             cmake {
-                arguments '-DANDROID_STL=gnustl_shared'
+                arguments '-DANDROID_STL=c++_shared'
             }
         }
     }

diff --git a/qDict/src/main/cpp/CMakeLists.txt b/qDict/src/main/cpp/CMakeLists.txt
@@ -29,10 +29,10 @@ target_include_directories(qdicteng PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/plugs
         )
 
-set(ANDROID_STL gnustl_shared)
+set(ANDROID_STL c++_shared)
 
 # Include libraries needed for qdicteng lib
 target_link_libraries(qdicteng
                       android
                       z
-                      log)
+                      log)
diff --git a/qDict/src/main/cpp/InfoFile.c b/qDict/src/main/cpp/InfoFile.c
@@ -2,7 +2,7 @@
 #include "utils/DictUtils.h"
 #include "utils/MapFile.h"
 #include <sys/stat.h>
-#include <Stdlib.h>
+#include <stdlib.h>
 
 static const char* skip_new_line(const char *p) {
 	if (!p)