diff --git a/engine.xcodeproj/project.pbxproj b/engine.xcodeproj/project.pbxproj index 14c57f6..f69ed59 100644 --- a/engine.xcodeproj/project.pbxproj +++ b/engine.xcodeproj/project.pbxproj @@ -1432,12 +1432,11 @@ libs/glm, libs/yoga, libs/tinyxml2, - /opt/local/include, libs/jpeg, libs/poly2tri/poly2tri, libs/base64, ); - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1483,12 +1482,11 @@ libs/glm, libs/yoga, libs/tinyxml2, - /opt/local/include, libs/jpeg, libs/poly2tri/poly2tri, libs/base64, ); - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; diff --git a/engine/app.cpp b/engine/app.cpp index 12410fa..1310fc7 100644 --- a/engine/app.cpp +++ b/engine/app.cpp @@ -168,8 +168,10 @@ bool App::check_license() CURL *curl = curl_easy_init(); if (curl) { - //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 = "http://omigamedev.com/panopainter/79516B99-8E67-40AD-B12F-149A5A9C2E15"; + //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; curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); diff --git a/engine/app_events.cpp b/engine/app_events.cpp index 3f56d14..144a6cb 100644 --- a/engine/app_events.cpp +++ b/engine/app_events.cpp @@ -51,7 +51,8 @@ void App::pick_image(std::function callback) #elif __OSX__ dispatch_async(dispatch_get_main_queue(), ^{ std::string path = [osx_view pick_file]; - callback(path); + if (!path.empty()) + callback(path); }); #elif __ANDROID__ //displayKeyboard(and_app, false);