omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix osx libcurl link

Browse Source
This commit is contained in:
omigamedev
2018-08-25 14:13:53 +02:00
parent ddd699166f
commit e8138c26ef
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine.xcodeproj/project.pbxproj
View File

@@ -1432,12 +1432,11 @@
libs/glm, libs/glm,
libs/yoga, libs/yoga,
libs/tinyxml2, libs/tinyxml2,
/opt/local/include,
libs/jpeg, libs/jpeg,
libs/poly2tri/poly2tri, libs/poly2tri/poly2tri,
libs/base64, libs/base64,
); );
LIBRARY_SEARCH_PATHS = /opt/local/lib; LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
@@ -1483,12 +1482,11 @@
libs/glm, libs/glm,
libs/yoga, libs/yoga,
libs/tinyxml2, libs/tinyxml2,
/opt/local/include,
libs/jpeg, libs/jpeg,
libs/poly2tri/poly2tri, libs/poly2tri/poly2tri,
libs/base64, libs/base64,
); );
LIBRARY_SEARCH_PATHS = /opt/local/lib; LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx; SDKROOT = macosx;

6
engine/app.cpp
View File

@@ -168,8 +168,10 @@ bool App::check_license()
CURL *curl = curl_easy_init(); CURL *curl = curl_easy_init();
if (curl) if (curl)
{ {
//std::string url = "http://omigamedev.com/panopainter/79516B99-8E67-40AD-B12F-149A5A9C2E15"; std::string url = "http://omigamedev.com/panopainter/79516B99-8E67-40AD-B12F-149A5A9C2E15";
std::string url = "https://panopainter.com/license/E8EDC2FE-E1BD-4AB1-91BD-FCCD926739BD.php"; //std::string url = "https://panopainter.com/license/E8EDC2FE-E1BD-4AB1-91BD-FCCD926739BD.php"; // wacom
//std::string url = "https://panopainter.com/license/A744FBA9-BC6C-43C8-BD24-0CCE24B3D985.php"; // others
std::string ret; std::string ret;
curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);

3
engine/app_events.cpp
View File

@@ -51,7 +51,8 @@ void App::pick_image(std::function<void(std::string path)> callback)
#elif __OSX__ #elif __OSX__
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
std::string path = [osx_view pick_file]; std::string path = [osx_view pick_file];
callback(path); if (!path.empty())
callback(path);
}); });
#elif __ANDROID__ #elif __ANDROID__
//displayKeyboard(and_app, false); //displayKeyboard(and_app, false);