mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-17 12:03:07 +01:00
Refactor project build scripts
This is mostly refactoring of cmake scripts, but also touches build.sh and install.sh. The cmake should be much more palatable now for major Linux distributions. At the same time, new configuration is introduced to Linux version, one with Twitch enabled. Please note, however, this change requires update of orctlibs.zip for mingw builds.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
extern "C" {
|
||||
#include "http.h"
|
||||
#include "../platform/platform.h"
|
||||
}
|
||||
|
||||
#ifdef DISABLE_HTTP
|
||||
@@ -10,7 +11,6 @@ void http_dispose() { }
|
||||
#else
|
||||
|
||||
#include <SDL.h>
|
||||
#include <jansson/jansson.h>
|
||||
|
||||
// cURL includes windows.h, but we don't need all of it.
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
@@ -69,8 +69,8 @@ http_json_response *http_request_json(const char *url)
|
||||
writeBuffer.length = 0;
|
||||
writeBuffer.capacity = 0;
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, TRUE);
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, TRUE);
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true);
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, true);
|
||||
curl_easy_setopt(curl, CURLOPT_CAINFO, "curl-ca-bundle.crt");
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &writeBuffer);
|
||||
@@ -149,4 +149,4 @@ void http_request_json_dispose(http_json_response *response)
|
||||
free(response);
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user