From ac3104cd6b12a47f9d1d5c3dfc66f5822946893d Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Mon, 13 Jul 2020 16:17:52 +0800 Subject: [PATCH] fix windows build (#114) --- sources/CMakeLists.txt | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index f70b0d3e..433bcd1d 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -16,41 +16,13 @@ set(CC_EXTERNAL_SROUCES ${CMAKE_CURRENT_LIST_DIR}/unzip/unzip.cpp ${CMAKE_CURRENT_LIST_DIR}/unzip/unzip.h - + ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTFWrapper.cpp ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.c ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyalloc.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyalloc.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarray.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarray.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblk.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblk.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblkof.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblkof.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayof.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayof.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommychain.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhash.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhash.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashdyn.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashdyn.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashlin.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashlin.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashtbl.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashtbl.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommylist.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommylist.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytree.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytree.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrie.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrie.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrieinp.c - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrieinp.h - ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytypes.h ) if(ANDROID) @@ -58,11 +30,11 @@ if(ANDROID) include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/tremolo/CMakeLists.txt) - list(APPEND CC_EXTERNAL_LIBS + list(APPEND CC_EXTERNAL_LIBS pvmp3dec vorbisidec ) - + elseif(WINDOWS) set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c PROPERTIES LANGUAGE C