node-sword-interface 1.0.86 → 1.0.88
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/binding.gyp
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
'message': 'Building sword library for iOS...',
|
|
22
22
|
'inputs': [],
|
|
23
23
|
'outputs': ['sword_build/libsword.a'],
|
|
24
|
-
'action': ['./scripts/build_sword.sh', '--ios', '${PLATFORM_NAME}', '<(ios_ver)'],
|
|
24
|
+
'action': ['./scripts/build_sword.sh', '--ios', '${PLATFORM_NAME}', '<(ios_ver)', '${ARCHS}'],
|
|
25
25
|
}
|
|
26
26
|
]
|
|
27
27
|
}],
|
package/package.json
CHANGED
package/scripts/build_sword.sh
CHANGED
|
@@ -85,11 +85,19 @@ elif [ "$1" = "--ios" ] ; then
|
|
|
85
85
|
|
|
86
86
|
IOS_TARGET="$2"
|
|
87
87
|
IOS_VER="$3"
|
|
88
|
+
IOS_ARCH="$4"
|
|
88
89
|
|
|
89
90
|
if [ -z "$IOS_VER" ]; then
|
|
90
91
|
IOS_VER="13.0"
|
|
91
92
|
fi
|
|
92
93
|
|
|
94
|
+
if [ -z "$IOS_ARCH" ]; then
|
|
95
|
+
IOS_ARCH="arm64"
|
|
96
|
+
fi
|
|
97
|
+
|
|
98
|
+
# Replace spaces with semicolons for CMake list
|
|
99
|
+
IOS_ARCH=$(echo "$IOS_ARCH" | tr ' ' ';')
|
|
100
|
+
|
|
93
101
|
SYSROOT="iphoneos"
|
|
94
102
|
if echo "$IOS_TARGET" | grep -q "simulator"; then
|
|
95
103
|
SYSROOT="iphonesimulator"
|
|
@@ -100,7 +108,7 @@ elif [ "$1" = "--ios" ] ; then
|
|
|
100
108
|
cmake -DCMAKE_SYSTEM_NAME=iOS \
|
|
101
109
|
-DLIBSWORD_LIBRARY_TYPE=Static \
|
|
102
110
|
-DCMAKE_CXX_STANDARD=11 \
|
|
103
|
-
-DCMAKE_OSX_ARCHITECTURES="
|
|
111
|
+
-DCMAKE_OSX_ARCHITECTURES="$IOS_ARCH" \
|
|
104
112
|
-DCMAKE_OSX_SYSROOT=$SYSROOT \
|
|
105
113
|
-DCMAKE_OSX_DEPLOYMENT_TARGET=$IOS_VER \
|
|
106
114
|
-DCMAKE_BUILD_TYPE=$SWORD_BUILD_TYPE \
|
|
@@ -327,7 +327,7 @@ vector<SWModule*> RepositoryInterface::getUpdatedRepoModules(string repoName, bo
|
|
|
327
327
|
for (auto const& moduleStatus : moduleStatusMap) {
|
|
328
328
|
const unsigned int updateStatus = moduleStatus.second;
|
|
329
329
|
|
|
330
|
-
if (updateStatus == InstallMgr::MODSTAT_UPDATED) {
|
|
330
|
+
if (updateStatus == static_cast<unsigned int>(InstallMgr::MODSTAT_UPDATED)) {
|
|
331
331
|
updatedModules.push_back(moduleStatus.first);
|
|
332
332
|
}
|
|
333
333
|
}
|