Skip to content

Static Linking Fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MikuAuahDark merged 1 commit into from
Sep 17, 2023
Merged

Static Linking Fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ endif ()

### "Libraries"
add_library (https MODULE
lua/main.cpp
lua/luahttps.cpp
)

add_library (https-common STATIC
Expand Down
4 changes: 4 additions & 0 deletions src/generic/CurlClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,22 @@
#include <sstream>
#include <vector>

#ifndef HTTPS_BACKEND_CURL_LINKED
// Dynamic library loader
#ifdef _WIN32
#include <windows.h>
#else
#include <dlfcn.h>
#endif
#endif

typedef struct StringReader
{
const std::string *str;
size_t pos;
} StringReader;

#ifndef HTTPS_BACKEND_CURL_LINKED
template <class T>
static inline bool loadSymbol(T &var, void *handle, const char *name)
{
Expand All @@ -35,6 +38,7 @@ static inline bool loadSymbol(T &var, void *handle, const char *name)
#endif
return var != nullptr;
}
#endif

CurlClient::Curl::Curl()
: handle(nullptr)
Expand Down
0 src/lua/main.cpp → src/lua/luahttps.cpp
View file
Open in desktop
File renamed without changes.