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

move curl for iOS and android into a submodule instead of abs path, include sqlite3 into Xcode project

Browse Source
This commit is contained in:
omigamedev
2018-10-11 12:53:59 +02:00
parent d870f68ed6
commit bc0ac5d893
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -15,7 +15,7 @@
url = https://bitbucket.org/omigamedev/libglew-2.0.0.git
[submodule "libs/curl-android-ios"]
path = libs/curl-android-ios
url = https://github.com/gcesarmza/curl-android-ios
url = https://bitbucket.org/omigamedev/curl-android-ios.git
[submodule "libs/jpeg"]
path = libs/jpeg
url = https://github.com/richgel999/jpeg-compressor.git

24
PanoPainter.xcodeproj/project.pbxproj
View File

@@ -134,6 +134,8 @@
ADC0EB3F1FBDC748004079BB /* node_colorwheel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB3B1FBDC748004079BB /* node_colorwheel.cpp */; };
ADC0EB431FC36E88004079BB /* node_dialog_picker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB401FC36E88004079BB /* node_dialog_picker.cpp */; };
ADC0EB441FC36E88004079BB /* node_dialog_picker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB401FC36E88004079BB /* node_dialog_picker.cpp */; };
ADC6B6C8216E0F0000DED870 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = ADC6B6C7216E0F0000DED870 /* sqlite3.c */; };
ADC6B6C9216E0F0D00DED870 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = ADC6B6C7216E0F0000DED870 /* sqlite3.c */; };
ADC6F4621F3AFF2C004177FA /* node_dialog_layer_rename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */; };
ADC6F4631F3AFF2D004177FA /* node_dialog_layer_rename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */; };
ADC6F4671F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; };
@@ -420,6 +422,7 @@
ADC0EB3C1FBDC748004079BB /* node_colorwheel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = node_colorwheel.h; sourceTree = "<group>"; };
ADC0EB401FC36E88004079BB /* node_dialog_picker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = node_dialog_picker.cpp; sourceTree = "<group>"; };
ADC0EB411FC36E88004079BB /* node_dialog_picker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = node_dialog_picker.h; sourceTree = "<group>"; };
ADC6B6C7216E0F0000DED870 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = libs/sqlite3/sqlite3.c; sourceTree = "<group>"; };
ADC6F4601F3AFA2A004177FA /* node_dialog_layer_rename.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = node_dialog_layer_rename.h; sourceTree = "<group>"; };
ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = node_dialog_layer_rename.cpp; sourceTree = "<group>"; };
ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_dialogs.cpp; sourceTree = "<group>"; };
@@ -769,6 +772,7 @@
AD58E0731E3421CB006ACC15 /* libs */ = {
isa = PBXGroup;
children = (
ADC6B6C6216E0DB600DED870 /* sqlite3 */,
ADAE4B2F216D075400B1DD8C /* HockeySDKResources.bundle */,
ADE0862C212395B500945972 /* libSonarPenUniversal.a */,
ADD7D2AE1EBFA35F00D5A897 /* libcurl.a */,
@@ -833,6 +837,14 @@
path = PanoThumb;
sourceTree = "<group>";
};
ADC6B6C6216E0DB600DED870 /* sqlite3 */ = {
isa = PBXGroup;
children = (
ADC6B6C7216E0F0000DED870 /* sqlite3.c */,
);
name = sqlite3;
sourceTree = "<group>";
};
ADD7D26C1EBF9AE300D5A897 /* PanoPainter */ = {
isa = PBXGroup;
children = (
@@ -1291,6 +1303,7 @@
AD0E5CD61ECC72AD00C35669 /* bezier.cpp in Sources */,
AD0E5CB61ECC72AD00C35669 /* Yoga.c in Sources */,
ADE4911D1F86E65E00FB8E92 /* shapes.cc in Sources */,
ADC6B6C9216E0F0D00DED870 /* sqlite3.c in Sources */,
ADC0EB441FC36E88004079BB /* node_dialog_picker.cpp in Sources */,
AD0E5CC51ECC72AD00C35669 /* node_panel_color.cpp in Sources */,
AD0E5CD71ECC72AD00C35669 /* brush.cpp in Sources */,
@@ -1413,6 +1426,7 @@
ADD7D2A01EBF9E1C00D5A897 /* image.cpp in Sources */,
ADD7D2A11EBF9E1C00D5A897 /* texture.cpp in Sources */,
AD0E119C1ECA215600CDA6BB /* app_events.cpp in Sources */,
ADC6B6C8216E0F0000DED870 /* sqlite3.c in Sources */,
ADFD32272166C9A000F46F85 /* node_dialog_resize.cpp in Sources */,
ADBC8C551FAFD0520094B339 /* app_cloud.cpp in Sources */,
ADD7D2961EBF9E1C00D5A897 /* brush.cpp in Sources */,
@@ -1593,6 +1607,7 @@
libs/jpeg,
libs/poly2tri/poly2tri,
libs/base64,
libs/sqlite3,
);
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -1652,6 +1667,7 @@
libs/jpeg,
libs/poly2tri/poly2tri,
libs/base64,
libs/sqlite3,
);
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -1845,7 +1861,6 @@
"$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework",
);
HEADER_SEARCH_PATHS = (
"/Users/omimac/Downloads/curl-android-ios-master/prebuilt-with-ssl/iOS/include",
libs/stb,
libs/glm,
libs/yoga,
@@ -1855,12 +1870,13 @@
libs/poly2tri/poly2tri,
libs/base64,
libs/libSonarPen/include,
"libs/curl-android-ios/iOS/include",
);
INFOPLIST_FILE = PanoPainter/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"/Users/omimac/Downloads/curl-android-ios-master/prebuilt-with-ssl/iOS",
"libs/curl-android-ios/iOS",
"$(PROJECT_DIR)/libs/libSonarPen",
);
PRODUCT_BUNDLE_IDENTIFIER = com.omixlab.panopainter.ios;
@@ -1884,7 +1900,6 @@
"$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework",
);
HEADER_SEARCH_PATHS = (
"/Users/omimac/Downloads/curl-android-ios-master/prebuilt-with-ssl/iOS/include",
libs/stb,
libs/glm,
libs/yoga,
@@ -1894,12 +1909,13 @@
libs/poly2tri/poly2tri,
libs/base64,
libs/libSonarPen/include,
"libs/curl-android-ios/iOS/include",
);
INFOPLIST_FILE = PanoPainter/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"/Users/omimac/Downloads/curl-android-ios-master/prebuilt-with-ssl/iOS",
"libs/curl-android-ios/iOS",
"$(PROJECT_DIR)/libs/libSonarPen",
);
PRODUCT_BUNDLE_IDENTIFIER = com.omixlab.panopainter.ios;

2
libs/curl-android-ios

Submodule libs/curl-android-ios updated: d4b60d3fe0...b52a7fd941

1
src/pch.h
View File

@@ -119,3 +119,4 @@
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <curl/curl.h>
#include <sqlite3.h>