From 30ee8939cd9088deed63ee520600fabdc4f0cd63 Mon Sep 17 00:00:00 2001 From: c2ny Date: Thu, 15 Jan 2026 09:31:55 -0500 Subject: [PATCH] added openssl --- .gitmodules | 3 +++ CMakeLists.txt | 41 +++++++++++++++++++++++++---------------- CMakePresets.json | 8 -------- extern/openssl | 1 + 4 files changed, 29 insertions(+), 24 deletions(-) create mode 160000 extern/openssl diff --git a/.gitmodules b/.gitmodules index e69de29..9aae677 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "extern/openssl"] + path = extern/openssl + url = https://github.com/openssl/openssl.git diff --git a/CMakeLists.txt b/CMakeLists.txt index e33aca2..17bdd13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,30 +9,39 @@ set(C_STANDARD_REQUIRED True) add_executable(${PROJECT_NAME} src/main.c) +set(EXTERN "${PROJECT_SOURCE_DIR}/extern") + # Pull all submodules if haven't already -# find_package(Git QUIET) -# if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") -# option(GIT_SUBMODULE "Check submodules during build" ON) -# if(GIT_SUBMODULE) -# message(STATUS "Submodule update") -# execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive -# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -# RESULT_VARIABLE GIT_SUBMOD_RESULT) -# if(NOT GIT_SUBMOD_RESULT EQUAL "0") -# message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") -# endif() -# endif() -# endif() -# -# if(NOT EXISTS "${PROJECT_SOURCE_DIR}/extern/libsoundio/CMakeLists.txt") +find_package(Git QUIET) +if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") + option(GIT_SUBMODULE "Check submodules during build" ON) + if(GIT_SUBMODULE) + message(STATUS "Submodule update") + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE GIT_SUBMOD_RESULT) + if(NOT GIT_SUBMOD_RESULT EQUAL "0") + message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") + endif() + endif() +endif() + +# if(NOT EXISTS "${PROJECT_SOURCE_DIR}/extern/openssl/CMakeLists.txt") # message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") # endif() set(BUILD_DYNAMIC_LIBS ON CACHE BOOL "" FORCE) set(BUILD_STATIC_LIBS ON CACHE BOOL "" FORCE) -# libsoundio +# miniaudio target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/extern/miniaudio") # math target_link_libraries(${PROJECT_NAME} PRIVATE m) + +# openssl +# TODO: run ./extern/openssl/Configure and make +target_link_directories(${PROJECT_NAME} PRIVATE "${EXTERN}/openssl") +target_link_libraries(${PROJECT_NAME} PRIVATE ssl crypto) +target_include_directories(${PROJECT_NAME} PRIVATE "${EXTERN}/openssl/include") + diff --git a/CMakePresets.json b/CMakePresets.json index 88b324b..dbba25b 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -9,14 +9,6 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "DEBUG", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - - "BUILD_EXAMPLE_PROGRAMS": true, - "BUILD_TESTS": false, - "ENABLE_ALSA": true, - "ENABLE_PULSEAUDIO": false, - "ENABLE_JACK": false, - "ENABLE_COREAUDIO": false, - "ENABLE_WASAPI": false } } ], diff --git a/extern/openssl b/extern/openssl new file mode 160000 index 0000000..b6a281b --- /dev/null +++ b/extern/openssl @@ -0,0 +1 @@ +Subproject commit b6a281b75f360564eb489312e960fe1e28985ac8