mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-10 12:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into beta

Browse Source
This commit is contained in:
David Capello 2021-10-25 18:29:34 -03:00
commit 621bc209ac
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ver/info.c
View File

@ -1,5 +1,5 @@
/* Aseprite /* Aseprite
Copyright (C) 2020 Igara Studio S.A. Copyright (C) 2020-2021 Igara Studio S.A.
This program is distributed under the terms of This program is distributed under the terms of
the End-User License Agreement for Aseprite. */ the End-User License Agreement for Aseprite. */
@ -8,16 +8,22 @@
#include "generated_version.h" /* It defines the VERSION macro */ #include "generated_version.h" /* It defines the VERSION macro */
#define PACKAGE "Aseprite" #define PACKAGE "Aseprite"
#define COPYRIGHT "Copyright (C) 2001-2020 Igara Studio S.A." #define COPYRIGHT "Copyright (C) 2001-2021 Igara Studio S.A."
#if defined(_WIN32) || defined(__APPLE__)
#define HTTP "https"
#else
#define HTTP "http"
#endif
#ifdef CUSTOM_WEBSITE_URL #ifdef CUSTOM_WEBSITE_URL
#define WEBSITE CUSTOM_WEBSITE_URL /* To test web server */ #define WEBSITE CUSTOM_WEBSITE_URL /* To test web server */
#else #else
#define WEBSITE "http://www.aseprite.org/" #define WEBSITE HTTP "://www.aseprite.org/"
#endif #endif
#define WEBSITE_DOWNLOAD WEBSITE "download/" #define WEBSITE_DOWNLOAD WEBSITE "download/"
#define WEBSITE_CONTRIBUTORS WEBSITE "contributors/" #define WEBSITE_CONTRIBUTORS WEBSITE "contributors/"
#define WEBSITE_NEWS_RSS "http://blog.aseprite.org/rss" #define WEBSITE_NEWS_RSS HTTP "://blog.aseprite.org/rss"
#define WEBSITE_UPDATE WEBSITE "update/?xml=1" #define WEBSITE_UPDATE WEBSITE "update/?xml=1"
const char* get_app_name() { return PACKAGE; } const char* get_app_name() { return PACKAGE; }

13
third_party/CMakeLists.txt vendored
View File

@ -50,8 +50,19 @@ endif()
if(REQUIRE_CURL AND NOT USE_SHARED_CURL) if(REQUIRE_CURL AND NOT USE_SHARED_CURL)
set(BUILD_RELEASE_DEBUG_DIRS ON BOOL) set(BUILD_RELEASE_DEBUG_DIRS ON BOOL)
set(CMAKE_USE_OPENSSL OFF CACHE BOOL "Use OpenSSL code. Experimental")
set(BUILD_CURL_EXE OFF CACHE BOOL "Set to ON to build curl executable.") set(BUILD_CURL_EXE OFF CACHE BOOL "Set to ON to build curl executable.")
# SSL/TLS support (use native libraries only)
set(CMAKE_USE_OPENSSL OFF CACHE BOOL "Use OpenSSL code. Experimental")
set(CMAKE_USE_LIBSSH2 OFF CACHE BOOL "Use libSSH2")
if(WIN32)
set(CMAKE_USE_SCHANNEL ON CACHE BOOL "enable Windows native SSL/TLS")
elseif(APPLE)
set(CMAKE_USE_SECTRANSP ON CACHE BOOL "enable Apple OS native SSL/TLS")
else()
# TODO Linux?
endif()
add_subdirectory(curl) add_subdirectory(curl)
endif() endif()