diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bed135f..cfe585e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,7 @@ list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS MESSAGE(STATUS "platform path: ${platform_spec_path}") include(${CMAKE_CURRENT_LIST_DIR}/cmake/CocosExternalConfig.cmake) include(${CMAKE_CURRENT_LIST_DIR}/sources/CMakeLists.txt) - -if(WINDOWS) +if(WINDOWS OR NX_WINDOWS) include(${CMAKE_CURRENT_LIST_DIR}/win64/CMakeLists.txt) elseif(ANDROID) include(${CMAKE_CURRENT_LIST_DIR}/android/CMakeLists.txt) @@ -28,4 +27,5 @@ elseif(EMSCRIPTEN) include(${CMAKE_CURRENT_LIST_DIR}/emscripten/CMakeLists.txt) elseif(LINUX) include(${CMAKE_CURRENT_LIST_DIR}/linux/CMakeLists.txt) +elseif(NX) endif() diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index bbb22d13..5b7b898e 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -45,7 +45,9 @@ if(NOT USE_MODULES) endif() # 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) @@ -72,7 +74,7 @@ if(ANDROID) include_directories(${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include) endif() -if(ANDROID OR OHOS) +if(ANDROID OR OHOS OR NX) include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/tremolo/CMakeLists.txt) @@ -90,11 +92,18 @@ elseif(APPLE) if(USE_SOCKET) include(${CMAKE_CURRENT_LIST_DIR}/SocketRocket/CMakeLists.txt) endif() +elseif(NX_WINDOWS) + include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt) + list(APPEND CC_EXTERNAL_LIBS + pvmp3dec + ) endif() -list(APPEND CC_EXTERNAL_INCLUDES - ${CMAKE_CURRENT_LIST_DIR} -) +if((NOT NX_WINDOWS) AND (NOT NX)) + list(APPEND CC_EXTERNAL_INCLUDES + ${CMAKE_CURRENT_LIST_DIR} + ) +endif() if(USE_PHYSICS_PHYSX) list(APPEND CC_EXTERNAL_INCLUDES diff --git a/sources/pvmp3dec/CMakeLists.txt b/sources/pvmp3dec/CMakeLists.txt index bf84a3fc..f434bd16 100644 --- a/sources/pvmp3dec/CMakeLists.txt +++ b/sources/pvmp3dec/CMakeLists.txt @@ -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)") endif() -target_compile_options(pvmp3dec PRIVATE - #-fsanitize=signed-integer-overflow - -include ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h - # -) - +if (NOT NX_WINDOWS) + target_compile_options(pvmp3dec PRIVATE + #-fsanitize=signed-integer-overflow + -include ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h + # + ) +endif() diff --git a/sources/pvmp3dec/src/pvmp3_decode_huff_cw.cpp b/sources/pvmp3dec/src/pvmp3_decode_huff_cw.cpp index 6e45a18a..1d9e2f58 100644 --- a/sources/pvmp3dec/src/pvmp3_decode_huff_cw.cpp +++ b/sources/pvmp3dec/src/pvmp3_decode_huff_cw.cpp @@ -139,7 +139,9 @@ uint16 pvmp3_decode_huff_cw_tab0(tmp3Bits *pMainData) { +#if (CC_PLATFORM != CC_PLATFORM_NX_WINDOWS) OSCL_UNUSED_ARG(pMainData); +#endif return(0); }