LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Kjell Wooding 2019-01-10 14:49:24 -05:00
commit 1d85617b76
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
recipes/numpy/__init__.py
View file

@ -6,7 +6,7 @@ import shutil
class NumpyRecipe(CythonRecipe):
version = "1.9.1"
url = "http://pypi.python.org/packages/source/n/numpy/numpy-{version}.tar.gz"
url = "https://pypi.python.org/packages/source/n/numpy/numpy-{version}.tar.gz"
library = "libnumpy.a"
libraries = ["libnpymath.a", "libnpysort.a"]
include_dir = "numpy/core/include"

6
tools/templates/{{ cookiecutter.project_name }}-ios/{{ cookiecutter.project_name }}.xcodeproj/project.pbxproj
View file

@ -11,6 +11,7 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
2CB5F34717D5233A006187AB /* bridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CB5F34617D5233A006187AB /* bridge.m */; };
59738AB51A8BB5D8001B2C0C /* lib in Resources */ = {isa = PBXBuildFile; fileRef = 59738AB41A8BB5D8001B2C0C /* lib */; };
59FDEA8B21E7D34E004E6ECE /* include in Resources */ = {isa = PBXBuildFile; fileRef = 59FDEA8A21E7D34E004E6ECE /* include */; };
59738ABB1A8E19AA001B2C0C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 59738ABA1A8E19AA001B2C0C /* Images.xcassets */; };
59738ADB1A8E62D6001B2C0C /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 59738AD01A8E62D6001B2C0C /* Default-568h@2x.png */; };
59738ADC1A8E62D6001B2C0C /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 59738AD11A8E62D6001B2C0C /* Default-667h@2x.png */; };
@ -33,6 +34,7 @@
2CB5F34517D5233A006187AB /* bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bridge.h; sourceTree = SOURCE_ROOT; };
2CB5F34617D5233A006187AB /* bridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = bridge.m; sourceTree = SOURCE_ROOT; };
59738AB41A8BB5D8001B2C0C /* lib */ = {isa = PBXFileReference; lastKnownFileType = folder; name = lib; path = {{ cookiecutter.dist_dir }}/root/python{{ cookiecutter.python_major }}/lib; sourceTree = "<group>"; };
59FDEA8A21E7D34E004E6ECE /* include */ = {isa = PBXFileReference; lastKnownFileType = folder; name = include; path = {{ cookiecutter.dist_dir }}/root/python{{ cookiecutter.python_major }}/include; sourceTree = "<group>"; };
59738ABA1A8E19AA001B2C0C /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = {{ cookiecutter.project_name }}/Images.xcassets; sourceTree = "<group>"; };
59738AD01A8E62D6001B2C0C /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "LaunchImages/Default-568h@2x.png"; sourceTree = "<group>"; };
59738AD11A8E62D6001B2C0C /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-667h@2x.png"; path = "LaunchImages/Default-667h@2x.png"; sourceTree = "<group>"; };
@ -103,6 +105,7 @@
children = (
59738ABA1A8E19AA001B2C0C /* Images.xcassets */,
59738AB41A8BB5D8001B2C0C /* lib */,
59FDEA8A21E7D34E004E6ECE /* include */,
01532DA9137C099F0076F6BF /* icon.png */,
8D1107310486CEB800E47090 /* {{ cookiecutter.project_name }}-Info.plist */,
59738AD01A8E62D6001B2C0C /* Default-568h@2x.png */,
@ -184,6 +187,7 @@
files = (
59738AE41A8E62D6001B2C0C /* Default@2x.png in Resources */,
59738AB51A8BB5D8001B2C0C /* lib in Resources */,
59FDEA8B21E7D34E004E6ECE /* include in Resources */,
59738ABB1A8E19AA001B2C0C /* Images.xcassets in Resources */,
59738ADE1A8E62D6001B2C0C /* Default-Landscape.png in Resources */,
59738AE31A8E62D6001B2C0C /* Default.png in Resources */,
@ -346,6 +350,7 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
DEAD_CODE_STRIPPING = NO;
ENABLE_BITCODE = NO;
USER_HEADER_SEARCH_PATHS = {{ cookiecutter.dist_dir }}/root/include/;
@ -355,6 +360,7 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
DEAD_CODE_STRIPPING = NO;
ENABLE_BITCODE = NO;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";