afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v3.5' into v3.6_merge_v3.5

This commit is contained in:
minggo 2022-06-07 15:39:40 +08:00
parent 9a6b364f70 d576db3d0f
commit 7b0b2bc14e
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -10,8 +10,7 @@ list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS
MESSAGE(STATUS "platform path: ${platform_spec_path}") MESSAGE(STATUS "platform path: ${platform_spec_path}")
include(${CMAKE_CURRENT_LIST_DIR}/cmake/CocosExternalConfig.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cmake/CocosExternalConfig.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/sources/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/sources/CMakeLists.txt)
if(WINDOWS OR NX_WINDOWS)
if(WINDOWS)
include(${CMAKE_CURRENT_LIST_DIR}/win64/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/win64/CMakeLists.txt)
elseif(ANDROID) elseif(ANDROID)
include(${CMAKE_CURRENT_LIST_DIR}/android/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/android/CMakeLists.txt)
@ -28,4 +27,5 @@ elseif(EMSCRIPTEN)
include(${CMAKE_CURRENT_LIST_DIR}/emscripten/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/emscripten/CMakeLists.txt)
elseif(LINUX) elseif(LINUX)
include(${CMAKE_CURRENT_LIST_DIR}/linux/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/linux/CMakeLists.txt)
elseif(NX)
endif() endif()

19
sources/CMakeLists.txt
View File

@ -45,7 +45,9 @@ if(NOT USE_MODULES)
endif() endif()
# add dependent boost libs # add dependent boost libs
include(${CMAKE_CURRENT_LIST_DIR}/boost-source/boost.cmake) if(NOT NX)
include(${CMAKE_CURRENT_LIST_DIR}/boost-source/boost.cmake)
endif()
if(ANDROID AND CC_ENABLE_SWAPPY) if(ANDROID AND CC_ENABLE_SWAPPY)
@ -72,7 +74,7 @@ if(ANDROID)
include_directories(${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include) include_directories(${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include)
endif() endif()
if(ANDROID OR OHOS) if(ANDROID OR OHOS OR NX)
include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/tremolo/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/tremolo/CMakeLists.txt)
@ -90,11 +92,18 @@ elseif(APPLE)
if(USE_SOCKET) if(USE_SOCKET)
include(${CMAKE_CURRENT_LIST_DIR}/SocketRocket/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/SocketRocket/CMakeLists.txt)
endif() endif()
elseif(NX_WINDOWS)
include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt)
list(APPEND CC_EXTERNAL_LIBS
pvmp3dec
)
endif() endif()
list(APPEND CC_EXTERNAL_INCLUDES if((NOT NX_WINDOWS) AND (NOT NX))
${CMAKE_CURRENT_LIST_DIR} list(APPEND CC_EXTERNAL_INCLUDES
) ${CMAKE_CURRENT_LIST_DIR}
)
endif()
if(USE_PHYSICS_PHYSX) if(USE_PHYSICS_PHYSX)
list(APPEND CC_EXTERNAL_INCLUDES list(APPEND CC_EXTERNAL_INCLUDES

13
sources/pvmp3dec/CMakeLists.txt
View File

@ -62,9 +62,10 @@ if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h "#pragma once\n#define OSCL_UNUSED_ARG(x) (void)(x)") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h "#pragma once\n#define OSCL_UNUSED_ARG(x) (void)(x)")
endif() endif()
target_compile_options(pvmp3dec PRIVATE if (NOT NX_WINDOWS)
#-fsanitize=signed-integer-overflow target_compile_options(pvmp3dec PRIVATE
-include ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h #-fsanitize=signed-integer-overflow
# -include ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h
) #
)
endif()

2
sources/pvmp3dec/src/pvmp3_decode_huff_cw.cpp
View File

@ -139,7 +139,9 @@
uint16 pvmp3_decode_huff_cw_tab0(tmp3Bits *pMainData) uint16 pvmp3_decode_huff_cw_tab0(tmp3Bits *pMainData)
{ {
#if (CC_PLATFORM != CC_PLATFORM_NX_WINDOWS)
OSCL_UNUSED_ARG(pMainData); OSCL_UNUSED_ARG(pMainData);
#endif
return(0); return(0);
} }