Skip to content

Commit 00f2a28

Browse files
slime73slime73
committed
Allow easier building without specific build system setup.
1 parent 6c375aa commit 00f2a28

20 files changed

Lines changed: 219 additions & 141 deletions

‎Android.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ LOCAL_ARM_NEON := true
1111

1212
LOCAL_C_INCLUDES := \
1313
${LOCAL_PATH}/src \
14-
${LOCAL_PATH}/src/android \
15-
${LOCAL_PATH}/src/android/ndk-build
14+
${LOCAL_PATH}/src/android
1615

1716
LOCAL_SRC_FILES := \
1817
src/lua/main.cpp \
18+
src/common/HTTPS.cpp \
1919
src/common/HTTPRequest.cpp \
2020
src/common/HTTPSClient.cpp \
2121
src/common/PlaintextConnection.cpp \

‎src/CMakeLists.txt‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@ cmake_minimum_required (VERSION 3.13)
22

33
### Basic compilation settings
44
set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
5-
add_definitions (-DNOMINMAX)
65

76
include_directories (
87
${CMAKE_CURRENT_SOURCE_DIR}
98
${CMAKE_CURRENT_BINARY_DIR}
109
)
1110

1211
### Compiler-specific flags
13-
if (MSVC)
14-
set (DLLEXPORT "__declspec(dllexport)")
15-
elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
16-
set (DLLEXPORT "__attribute__((visibility(\"default\")))")
12+
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
1713
add_compile_options ("-fvisibility=hidden")
1814
add_link_options ("-fvisibility=hidden")
1915
endif ()
@@ -24,6 +20,7 @@ add_library (https MODULE
2420
)
2521

2622
add_library (https-common STATIC
23+
common/HTTPS.cpp
2724
common/HTTPRequest.cpp
2825
common/HTTPSClient.cpp
2926
common/PlaintextConnection.cpp
@@ -95,22 +92,26 @@ include_directories (${LUA_INCLUDE_DIR})
9592
target_link_libraries (https ${LUA_LIBRARIES})
9693

9794
if (USE_CURL_BACKEND)
95+
set(HTTPS_BACKEND_CURL ON)
9896
find_package (CURL REQUIRED)
9997
include_directories (${CURL_INCLUDE_DIR})
10098
target_link_libraries (https https-curl ${CURL_LIBRARIES})
10199
endif ()
102100

103101
if (USE_OPENSSL_BACKEND)
102+
set(HTTPS_BACKEND_OPENSSL ON)
104103
find_package (OpenSSL REQUIRED)
105104
include_directories (${OPENSSL_INCLUDE_DIR})
106105
target_link_libraries (https https-openssl ${OPENSSL_LIBRARIES})
107106
endif ()
108107

109108
if (USE_SCHANNEL_BACKEND)
109+
set(HTTPS_BACKEND_SCHANNEL ON)
110110
target_link_libraries (https https-schannel ws2_32 secur32)
111111
endif ()
112112

113113
if (USE_NSURL_BACKEND)
114+
set(HTTPS_BACKEND_NSURL ON)
114115
set_target_properties(
115116
https-nsurl
116117
PROPERTIES
@@ -122,12 +123,14 @@ if (USE_NSURL_BACKEND)
122123
endif ()
123124

124125
if (USE_ANDROID_BACKEND)
126+
set(HTTPS_BACKEND_ANDROID ON)
125127
target_link_libraries (https https-android)
126128
message(STATUS "Ensure to add the Java files to your project too!")
127129
endif ()
128130

129-
### Generate config.h
131+
### Generate config-generated.h
132+
add_compile_definitions(HTTPS_HAVE_CONFIG_GENERATED_H)
130133
configure_file (
131-
common/config.h.in
132-
common/config.h
134+
common/config-generated.h.in
135+
common/config-generated.h
133136
)

‎src/android/AndroidClient.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "AndroidClient.h"
22

3-
#ifdef USE_ANDROID_BACKEND
3+
#ifdef HTTPS_BACKEND_ANDROID
44

55
#include <sstream>
66
#include <type_traits>
@@ -209,4 +209,4 @@ jclass AndroidClient::getHTTPSClass() const
209209
return httpsClass;
210210
}
211211

212-
#endif
212+
#endif // HTTPS_BACKEND_ANDROID

‎src/android/AndroidClient.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#pragma once
22

3-
#include "common/config.h"
3+
#include "../common/config.h"
44

5-
#ifdef USE_ANDROID_BACKEND
5+
#ifdef HTTPS_BACKEND_ANDROID
66

77
#include <jni.h>
88

9-
#include "common/HTTPSClient.h"
9+
#include "../common/HTTPSClient.h"
1010

1111
class AndroidClient: public HTTPSClient
1212
{

‎src/android/ndk-build/common/config.h‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/common/HTTPS.cpp‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#include "HTTPS.h"
2+
#include "config.h"
3+
#include "ConnectionClient.h"
4+
5+
#include <stdexcept>
6+
7+
#ifdef HTTPS_BACKEND_CURL
8+
# include "../generic/CurlClient.h"
9+
#endif
10+
#ifdef HTTPS_BACKEND_OPENSSL
11+
# include "../generic/OpenSSLConnection.h"
12+
#endif
13+
#ifdef HTTPS_BACKEND_SCHANNEL
14+
# include "../windows/SChannelConnection.h"
15+
#endif
16+
#ifdef HTTPS_BACKEND_NSURL
17+
# include "../macos/NSURLClient.h"
18+
#endif
19+
#ifdef HTTPS_BACKEND_ANDROID
20+
# include "../android/AndroidClient.h"
21+
#endif
22+
23+
#ifdef HTTPS_BACKEND_CURL
24+
static CurlClient curlclient;
25+
#endif
26+
#ifdef HTTPS_BACKEND_OPENSSL
27+
static ConnectionClient<OpenSSLConnection> opensslclient;
28+
#endif
29+
#ifdef HTTPS_BACKEND_SCHANNEL
30+
static ConnectionClient<SChannelConnection> schannelclient;
31+
#endif
32+
#ifdef HTTPS_BACKEND_NSURL
33+
static NSURLClient nsurlclient;
34+
#endif
35+
#ifdef HTTPS_BACKEND_ANDROID
36+
static AndroidClient androidclient;
37+
#endif
38+
39+
static HTTPSClient *clients[] = {
40+
#ifdef HTTPS_BACKEND_CURL
41+
&curlclient,
42+
#endif
43+
#ifdef HTTPS_BACKEND_OPENSSL
44+
&opensslclient,
45+
#endif
46+
#ifdef HTTPS_BACKEND_SCHANNEL
47+
&schannelclient,
48+
#endif
49+
#ifdef HTTPS_BACKEND_NSURL
50+
&nsurlclient,
51+
#endif
52+
#ifdef HTTPS_BACKEND_ANDROID
53+
&androidclient,
54+
#endif
55+
nullptr,
56+
};
57+
58+
HTTPSClient::Reply request(const HTTPSClient::Request &req)
59+
{
60+
for (size_t i = 0; clients[i]; ++i)
61+
{
62+
HTTPSClient &client = *clients[i];
63+
64+
if (client.valid())
65+
return client.request(req);
66+
}
67+
68+
throw std::runtime_error("No applicable HTTPS implementation found");
69+
}

‎src/common/HTTPS.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#pragma once
2+
3+
#include "HTTPSClient.h"
4+
5+
HTTPSClient::Reply request(const HTTPSClient::Request &req);

‎src/common/PlaintextConnection.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
#include "common/config.h"
1+
#include "config.h"
22
#include <cstring>
3-
#ifndef USE_WINSOCK
3+
#ifndef HTTPS_USE_WINSOCK
44
# include <netdb.h>
55
# include <unistd.h>
66
# include <sys/types.h>
77
# include <sys/socket.h>
88
#else
99
# include <winsock2.h>
1010
# include <ws2tcpip.h>
11-
#endif // USE_WINSOCK
11+
#endif // HTTPS_USE_WINSOCK
1212

1313
#include "PlaintextConnection.h"
1414

15-
#ifdef USE_WINSOCK
15+
#ifdef HTTPS_USE_WINSOCK
1616
static void close(int fd)
1717
{
1818
closesocket(fd);
1919
}
20-
#endif // USE_WINSOCK
20+
#endif // HTTPS_USE_WINSOCK
2121

2222
PlaintextConnection::PlaintextConnection()
2323
: fd(-1)
2424
{
25-
#ifdef USE_WINSOCK
25+
#ifdef HTTPS_USE_WINSOCK
2626
static bool wsaInit = false;
2727
if (!wsaInit)
2828
{
2929
WSADATA data;
3030
WSAStartup(MAKEWORD(2, 2), &data);
3131
}
32-
#endif // USE_WINSOCK
32+
#endif // HTTPS_USE_WINSOCK
3333
}
3434

3535
PlaintextConnection::~PlaintextConnection()

‎src/common/config-generated.h.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#cmakedefine HTTPS_BACKEND_CURL
2+
#cmakedefine HTTPS_BACKEND_OPENSSL
3+
#cmakedefine HTTPS_BACKEND_SCHANNEL
4+
#cmakedefine HTTPS_BACKEND_NSURL
5+
#cmakedefine HTTPS_BACKEND_ANDROID
6+
#cmakedefine HTTPS_USE_WINSOCK
7+
#cmakedefine DEBUG_SCHANNEL

‎src/common/config.h‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#pragma once
2+
3+
#if defined(HTTPS_HAVE_CONFIG_GENERATED_H)
4+
#include "config-generated.h"
5+
#elif defined(WIN32) || defined(_WIN32)
6+
#define HTTPS_BACKEND_SCHANNEL
7+
#define HTTPS_USE_WINSOCK
8+
#elif defined(__ANDROID__)
9+
#define HTTPS_BACKEND_ANDROID
10+
#elif defined(__APPLE__)
11+
#define HTTPS_BACKEND_NSURL
12+
#elif defined(linux) || defined(__linux) || defined(__linux__)
13+
#if defined __has_include
14+
#if __has_include(<curl/curl.h>)
15+
#define HTTPS_BACKEND_CURL
16+
#endif
17+
#if __has_include(<openssl/ssl.h>)
18+
#define HTTPS_BACKEND_OPENSSL
19+
#endif
20+
#else
21+
// Hope for the best...
22+
#define HTTPS_BACKEND_CURL
23+
#define HTTPS_BACKEND_OPENSSL
24+
#endif
25+
#endif
26+
27+
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
28+
#define HTTPS_DLLEXPORT __declspec(dllexport)
29+
#elif defined(__GNUC_) || defined(__clang__)
30+
#define HTTPS_DLLEXPORT __attribute__ ((visibility("default")))
31+
#else
32+
#define HTTPS_DLLEXPORT
33+
#endif

0 commit comments

Comments
 (0)