From fa8f6f0896a7efbfdf62d430e7862f697ae2c23d Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Wed, 15 Nov 2023 13:40:21 +0100 Subject: [PATCH] remove mbedtls, fix libzip for /MD(d) --- CMakeLists.txt | 2 +- cmake/libzip.cmake | 30 +++++++++++++++++++++++++-- cmake/libzippp.cmake | 5 ----- cmake/mbedtls.cmake | 39 ----------------------------------- cmake/zlib.cmake | 10 ++++++++- source/uMod_TextureServer.cpp | 12 +++++------ 6 files changed, 43 insertions(+), 55 deletions(-) delete mode 100644 cmake/mbedtls.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a3847a6..6677452 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in" "${VERSION_RC}" @ONLY set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/") set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/bin/install) add_compile_options(/MP /permissive-) diff --git a/cmake/libzip.cmake b/cmake/libzip.cmake index 2d5343b..23fa5b1 100644 --- a/cmake/libzip.cmake +++ b/cmake/libzip.cmake @@ -1,7 +1,6 @@ include_guard() include(FetchContent) include(zlib) -include(mbedtls) FetchContent_Declare( libzip @@ -20,8 +19,35 @@ if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zip.lib) return() endif() +set(OPTIONS + "-A" "Win32" + "-DZLIB_LIBRARY:PATH=${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib" + "-DZLIB_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/include" + "-DENABLE_COMMONCRYPTO=OFF" + "-DENABLE_GNUTLS=OFF" + "-DENABLE_MBEDTLS=OFF" + "-DENABLE_OPENSSL=OFF" + "-DENABLE_WINDOWS_CRYPTO=ON" + "-DENABLE_FDOPEN=OFF" + "-DENABLE_BZIP2=OFF" + "-DENABLE_LZMA=OFF" + "-DENABLE_ZSTD=OFF" + "-DBUILD_TOOLS=OFF" + "-DBUILD_REGRESS=OFF" + "-DBUILD_OSSFUZZ=OFF" + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_DOC=OFF" + "-DLIBZIP_DO_INSTALL =OFF" + "-DSHARED_LIB_VERSIONING=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}" + ) + +message("Building libzip with OPTIONS:\n${OPTIONS}") + execute_process( - COMMAND ${CMAKE_COMMAND} -A Win32 -DZLIB_LIBRARY:PATH=${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib -DZLIB_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/include -DMbedTLS_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/include -DMbedTLS_LIBRARY:PATH=${CMAKE_INSTALL_PREFIX}/lib/mbedtls.lib -DENABLE_MBEDTLS=ON -DENABLE_OPENSSL=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} . + COMMAND ${CMAKE_COMMAND} ${OPTIONS} . WORKING_DIRECTORY ${libzip_SOURCE_DIR} ) execute_process( diff --git a/cmake/libzippp.cmake b/cmake/libzippp.cmake index ddab32e..ee3a320 100644 --- a/cmake/libzippp.cmake +++ b/cmake/libzippp.cmake @@ -10,10 +10,6 @@ find_library(LIBZIP_LIBRARY REQUIRED NAMES zip PATHS ${CMAKE_INSTALL_PREFIX}/lib ) -find_library(MBEDTLS_LIBRARY REQUIRED - NAMES mbedtls - PATHS ${CMAKE_INSTALL_PREFIX}/lib -) FetchContent_Declare( libzippp @@ -40,7 +36,6 @@ target_compile_definitions(libzippp PUBLIC ) target_link_libraries(libzippp PRIVATE ${LIBZIP_LIBRARY} - ${MBEDTLS_LIBRARY} ${ZLIB_LIBRARY} ) diff --git a/cmake/mbedtls.cmake b/cmake/mbedtls.cmake deleted file mode 100644 index fa4ea24..0000000 --- a/cmake/mbedtls.cmake +++ /dev/null @@ -1,39 +0,0 @@ -include_guard() -include(FetchContent) - -# Fetch mbedtls using FetchContent -FetchContent_Declare( - mbedtls - GIT_REPOSITORY https://github.com/Mbed-TLS/mbedtls - GIT_TAG v3.5.1 -) - -FetchContent_GetProperties(mbedtls) - -if(mbedtls_POPULATED) - message(STATUS "Skipping mbedtls download") - return() -endif() - -FetchContent_Populate(mbedtls) - -if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/mbedtls.lib) - message(STATUS "Skipping mbedtls build") - return() -endif() - - -execute_process( - COMMAND ${CMAKE_COMMAND} -A Win32 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - WORKING_DIRECTORY ${mbedtls_SOURCE_DIR} -) -execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config Release - WORKING_DIRECTORY ${mbedtls_SOURCE_DIR} -) -execute_process( - COMMAND ${CMAKE_COMMAND} --install . --config Release - WORKING_DIRECTORY ${mbedtls_SOURCE_DIR} -) - -message(STATUS "Finished mbedtls build") diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index 2b1cf63..e369db7 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -22,9 +22,17 @@ if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib) return() endif() +set(OPTIONS + "-A" "Win32" + "-DBUILD_SHARED_LIBS=OFF" + "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}" +) + +message("Building zlib with OPTIONS:\n${OPTIONS}") execute_process( - COMMAND ${CMAKE_COMMAND} -A Win32 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + COMMAND ${CMAKE_COMMAND} ${OPTIONS} . WORKING_DIRECTORY ${zlib_SOURCE_DIR} ) execute_process( diff --git a/source/uMod_TextureServer.cpp b/source/uMod_TextureServer.cpp index c578363..fdaf50f 100644 --- a/source/uMod_TextureServer.cpp +++ b/source/uMod_TextureServer.cpp @@ -506,9 +506,9 @@ void uMod_TextureServer::LoadModsFromFile(char* source) char line[MAX_PATH]; while (fgets(line, sizeof(line), file) != nullptr) { Message("MainLoop: loading file %s\n", line); - for (auto i = 0; i < MAX_PATH; i++) { - if (line[i] == '\n') { - line[i] = 0; + for (char& i : line) { + if (i == '\n') { + i = 0; } } @@ -531,6 +531,7 @@ void uMod_TextureServer::LoadModsFromFile(char* source) int uMod_TextureServer::MainLoop() // run as a separated thread { + Message("MainLoop: begin\n"); Message("MainLoop: searching for modlist.txt\n"); char gwpath[MAX_PATH]; GetModuleFileName(GetModuleHandle(nullptr), gwpath, MAX_PATH); //ask for name and path of this executable @@ -555,10 +556,7 @@ int uMod_TextureServer::MainLoop() // run as a separated thread strcat(umodpath, "\\modlist.txt"); LoadModsFromFile(umodpath); - Message("MainLoop: begin\n"); - for (auto i = 0; i < 10; i++) { - std::this_thread::sleep_for(std::chrono::seconds(1)); - } + Message("MainLoop: end\n"); return RETURN_OK; }