Skip to content

Commit 13712d3

Browse files
committed
upgrade cmake ver
1 parent 7862a81 commit 13712d3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

library/src/main/jni/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
cmake_minimum_required(VERSION 3.9)
1+
cmake_minimum_required(VERSION 3.19)
22

33
project(CGE)
44

55
set(CMAKE_CXX_STANDARD 14)
66

77
option(CGE_USE_VIDEO_MODULE "boolean option to enable video module" OFF)
88

9-
if (NOT DEFINED ANDROID_GRADLE)
9+
if (NOT DEFINED ANDROID_GRADLE OR NOT ANDROID_GRADLE)
1010
if (NOT DEFINED ENV{NDK})
1111
execute_process(COMMAND which ndk-build OUTPUT_VARIABLE CGE_NDK_DIR)
1212
if ("${CGE_NDK_DIR}" STREQUAL "")
@@ -63,7 +63,7 @@ include_directories(
6363
${CMAKE_CURRENT_SOURCE_DIR}/custom
6464
${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg)
6565

66-
add_definitions(-DANDROID_NDK -DCGE_LOG_TAG=\"libCGE\" -DCGE_TEXTURE_PREMULTIPLIED=1 -D_CGE_USE_FFMPEG_ -D__STDC_CONSTANT_MACROS -D_CGE_DISABLE_GLOBALCONTEXT_ -O3 -D_CGE_ONLY_FILTERS_)
66+
add_definitions(-DANDROID_NDK -DCGE_LOG_TAG=\"libCGE\" -DCGE_TEXTURE_PREMULTIPLIED=1 -D_CGE_USE_FFMPEG_ -D__STDC_CONSTANT_MACROS -D_CGE_DISABLE_GLOBALCONTEXT_ -O3 -D_CGE_ONLY_FILTERS_=1 -D__STDC_CONSTANT_MACROS=1)
6767

6868
if (CGE_USE_VIDEO_MODULE)
6969

@@ -79,7 +79,7 @@ if (CGE_USE_VIDEO_MODULE)
7979
# endif ()
8080
endif ()
8181

82-
if (NOT DEFINED ANDROID_GRADLE)
82+
if (NOT DEFINED ANDROID_GRADLE OR NOT ANDROID_GRADLE)
8383
add_library(CGE
8484
${CGE_CORE_SRC}
8585
)

0 commit comments

Comments
 (0)