diff --git a/versions.txt b/versions.txt index fd4bd6ba..a1c5ad9c 100644 --- a/versions.txt +++ b/versions.txt @@ -107,9 +107,6 @@ PVRVFrame spirv_cross mac: 2021.1.15 ios: 2021.1.15 -iconv - win32: 0x0109 - win64: 0x0110 glslang (Built using https://github.com/YunHsiao/glslang/tree/build) win32: 11.5.0 (commit: 1978c76) @@ -117,4 +114,4 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build) android: 11.5.0 (commit: 1978c76) mac: 11.5.0 (commit: 1978c76) ios: 11.5.0 (commit: 1978c76) - \ No newline at end of file + diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index 6ab26746..ecfe69a3 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -32,16 +32,6 @@ set_target_properties(glew32 PROPERTIES IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glew32.lib ) -add_library(iconv SHARED IMPORTED GLOBAL) - -set_target_properties(iconv PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/iconv-2.dll - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/iconv.lib - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/charset-1.dll - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/charset.lib -) - - add_library(crypto STATIC IMPORTED GLOBAL) set_target_properties(crypto PROPERTIES @@ -245,7 +235,6 @@ endif() list(APPEND CC_EXTERNAL_LIBS glew32 - iconv crypto curl jpeg diff --git a/win64/libs/iconv-2.dll b/win64/libs/iconv-2.dll deleted file mode 100644 index 2f8804ea..00000000 Binary files a/win64/libs/iconv-2.dll and /dev/null differ diff --git a/win64/libs/iconv.lib b/win64/libs/iconv.lib deleted file mode 100644 index 22d51762..00000000 Binary files a/win64/libs/iconv.lib and /dev/null differ