cmake: add basic support #79
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A dynamic linked hlsdl has been built, these DLLs required if running outside MINGW64:
Actually dynamic linked hlsdl build always works on MINGW32/MINGW64 |
|
Sorry! my carelessness CMakeLists.txt build |
|
@mengmo Awesome, thank you. |
|
I'm not a diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d070f48..6e6de86 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,12 +14,12 @@ find_package(OpenSSL REQUIRED)
find_package(CURL REQUIRED)
find_package(Threads REQUIRED)
-add_executable(hlsdl main.c aes_openssl.c curl.c hls.c misc.c msg.c mpegts.c)
+add_executable(hlsdl src/main.c src/aes_openssl.c src/curl.c src/hls.c src/misc.c src/msg.c src/mpegts.c)
target_include_directories(hlsdl PRIVATE ${OPENSSL_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
if (WIN32)
- target_sources(hlsdl PRIVATE "../msvc/win/memmem.c")
+ target_sources(hlsdl PRIVATE "msvc/win/memmem.c")
endif()
target_link_libraries(hlsdl PRIVATE OpenSSL::Crypto CURL::libcurl Threads::Threads)...and moved it to the root-dir (where it belongs in my opinion). This is the (shortened) log of running Lots of "undefined reference"-errors! diff --git a/src/CMakeLists.txt b/CMakeLists.txt
index d070f48..12fdd49
--- a/src/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,16 +10,20 @@ if (APPLE AND NOT IOS)
endif()
endif()
+if (WIN32)
+ add_definitions(-DCURL_STATICLIB)
+endif()
+
find_package(OpenSSL REQUIRED)
find_package(CURL REQUIRED)
find_package(Threads REQUIRED)
-add_executable(hlsdl main.c aes_openssl.c curl.c hls.c misc.c msg.c mpegts.c)
+add_executable(hlsdl src/main.c src/aes_openssl.c src/curl.c src/hls.c src/misc.c src/msg.c src/mpegts.c)
target_include_directories(hlsdl PRIVATE ${OPENSSL_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
if (WIN32)
- target_sources(hlsdl PRIVATE "../msvc/win/memmem.c")
+ target_sources(hlsdl PRIVATE "msvc/win/memmem.c")
endif()
-target_link_libraries(hlsdl PRIVATE OpenSSL::Crypto CURL::libcurl Threads::Threads)
+target_link_libraries(hlsdl PRIVATE CURL::libcurl -lssl OpenSSL::Crypto -lz -lws2_32 -lgdi32 -lcrypt32 -lwldap32 Threads::Threads)...do I get a working I don't understand the need for either of these changes. After So it looks like ...from Again, I'm no expert, but I'd say these additional changes shouldn't be needed. The detection of |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@Reino17 @mengmo Opinion on this? Both of you have compiled hlsdl on Windows before so you might be interested.
This seems cleaner than the current build script but can you still build static binaries using this?