better support for windows

Author: wysaid

README.md

@@ -69,9 +69,9 @@ $NDK/ndk-build
 #And remove the loading part of ffmpeg&facetracker
 $NDK/ndk-build
 
-#For Window user, you should include the `.cmd` extension to `ndk-build` like this:
-cd your_path_to\android-gpuimage-plus-master\library\src\main\jni
-your_path_to_ndk\ndk-bundle\ndk-build.cmd
+#For Windows user, you should include the `.cmd` extension to `ndk-build` like this:
+cd <your\path\to\this\repo>\library\src\main\jni
+<your\path\to\ndk>\ndk-build.cmd
 
 #Also remember to comment out these line in NativeLibraryLoader
 //System.loadLibrary("ffmpeg");

gradle.properties

@@ -8,7 +8,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs+=-Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

library/src/main/jni/CMakeLists.txt

@@ -45,14 +45,23 @@ else ()
     file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI}")
 endif ()
 
-execute_process(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR}/cge -maxdepth 3 -type d OUTPUT_VARIABLE CGE_CORE_HEADER_DIR)
-execute_process(COMMAND bash -c "find \"${CMAKE_CURRENT_SOURCE_DIR}/cge\" -type f -iname '*.cpp' -o -iname '*.c'" OUTPUT_VARIABLE CGE_CORE_SRC)
-
+if (CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+    execute_process(COMMAND cmd.exe /C "dir /L /S /B /A:D"
+                OUTPUT_VARIABLE CGE_CORE_HEADER_DIR
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cge)
+else()
+    execute_process(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR}/cge -maxdepth 3 -type d OUTPUT_VARIABLE CGE_CORE_HEADER_DIR)
+endif()
+
+message("CGE_CORE_HEADER_DIR=${CGE_CORE_HEADER_DIR}")
 string(REGEX REPLACE "\n" ";" CGE_CORE_HEADER_DIR ${CGE_CORE_HEADER_DIR})
-string(REGEX REPLACE "\n" ";" CGE_CORE_SRC ${CGE_CORE_SRC})
 
-file(GLOB_RECURSE CGE_CORE_SRC_INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/interface/*.cpp")
-list(APPEND CGE_CORE_SRC ${CGE_CORE_SRC_INTERFACE})
+# execute_process(COMMAND bash -c "find \"${CMAKE_CURRENT_SOURCE_DIR}/cge\" -type f -iname '*.cpp' -o -iname '*.c'" OUTPUT_VARIABLE CGE_CORE_SRC)
+# string(REGEX REPLACE "\n" ";" CGE_CORE_SRC ${CGE_CORE_SRC})
+
+file(GLOB_RECURSE CGE_CORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/cge/*.cpp"
+                "${CMAKE_CURRENT_SOURCE_DIR}/cge/*.c"
+                "${CMAKE_CURRENT_SOURCE_DIR}/interface/*.cpp")
 
 include_directories(
         ${CGE_CORE_HEADER_DIR}

library/src/main/jni/buildJNI

@@ -4,10 +4,26 @@
 #NDK=/Users/wangyang/android_dev/android-ndk
 
 if [[ "$NDK" == "" ]]; then
-
-    echo "Please specify the NDK variable to your ndk-dir"
-    exit
-
+    if command -v ndk-build; then
+        export $NDK=$(command -v ndk-build)
+    elif command -v ndk-build.cmd; then
+        export $NDK=$(command -v ndk-build.cmd)
+    else
+        if ! command -v cmd; then
+            function cmd() {
+                if [[ -f "/mnt/c/Windows/system32/cmd.exe" ]]; then
+                    /mnt/c/Windows/system32/cmd.exe $@
+                fi
+            }
+        fi
+
+        echo "command -v cmd=$(command -v cmd)"
+
+        if [[ -z "$(command -v cmd &>/dev/null && cmd /C set | grep -i 'NDK')" ]]; then
+            echo "Please specify the NDK variable to your ndk-dir"
+            exit
+        fi
+    fi
 fi
 
 cd $(dirname $0)
@@ -71,4 +87,10 @@ if [[ -z "$THREADS" ]] || [[ "$THREADS" -eq "0" ]]; then
     THREADS=8
 fi
 
-$NDK/ndk-build ${BUILD_ARG} -j${THREADS}
+if [[ -n "$NDK" ]] && [[ -f "$NDK/ndk-build" ]]; then
+    "$NDK/ndk-build" ${BUILD_ARG} -j${THREADS}
+elif [[ -n $(command -v cmd && cmd /C set | grep -i 'NDK') ]]; then
+    cmd /C "set CGE_USE_VIDEO_MODULE=1 && %NDK%/ndk-build.cmd" ${BUILD_ARG} -j${THREADS}
+else
+    echo "Can not find NDK!"
+fi