Merge pull request #414 from dumganhar/v3.8.1-hmi
v3.8.1-hmi merges v3.8.0-hmi branch
This commit is contained in:
commit
2fe0317e84
|
|
@ -84,7 +84,8 @@ if(USE_SE_V8)
|
||||||
IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a
|
IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
|
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
|
||||||
)
|
)
|
||||||
set(se_libs_name v8_monolith v8_inspector)
|
set(se_libs_name v8_monolith)
|
||||||
|
set(se_libs_include ${platform_spec_path}/include/v8)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(USE_WEBSOCKET_SERVER)
|
if(USE_WEBSOCKET_SERVER)
|
||||||
|
|
@ -160,7 +161,9 @@ endif()
|
||||||
|
|
||||||
set(ZLIB z)
|
set(ZLIB z)
|
||||||
if(NOT USE_MODULES)
|
if(NOT USE_MODULES)
|
||||||
list(APPEND CC_EXTERNAL_LIBS ${ZLIB} ${se_libs_name})
|
list(APPEND CC_EXTERNAL_LIBS ${ZLIB}
|
||||||
|
${se_libs_name}
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ add_definitions(-DCC_SWAPPY_ENABLED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if(ANDROID)
|
if(ANDROID AND (NOT SURFACE_LESS_SERVICE))
|
||||||
set(CC_GAME_ACTIVITY_SOURCES
|
set(CC_GAME_ACTIVITY_SOURCES
|
||||||
${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
|
${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
|
||||||
${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/system_utils.cpp
|
${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/system_utils.cpp
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue