Skip to content

Commit 1cc154f

Browse files
committed
Change to libboost.a
1 parent 84f1f9d commit 1cc154f

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In Xcode **Build Settings** for your project:
3535

3636
In Xcode for a **Build Target** select the **Target under Build Phases**
3737

38-
- Add to **'Link Binary With Libraries'** the ```boost.a``` found in the ```ofxiOSBoost/libs/boost/lib/ios``` directory.
38+
- Add to **'Link Binary With Libraries'** the ```libboost.a``` found in the ```ofxiOSBoost/libs/boost/lib/ios``` directory.
3939

4040
If not openFrameworks just add the ``` libs/boost/include ``` to Header Search Paths and the ``` libs/boost/ios ``` to Library Search Paths
4141

addon_config.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
meta:
1818
ADDON_NAME = ofxiOSBoost
19-
ADDON_DESCRIPTION = Addon for the open source boost libraries 1.56.0. Includes pre-compiled binarys and scripts to build.
19+
ADDON_DESCRIPTION = Addon for the open source boost libraries 1.59.0. Includes pre-compiled binarys and scripts to build.
2020
ADDON_AUTHOR = Danoli3
2121
ADDON_TAGS = "ios" "boost"
2222
ADDON_URL = http://github.com/danoli3/ofxiOSBoost
@@ -29,7 +29,7 @@ common:
2929
# include search paths, this will be usually parsed from the file system
3030
# but if the addon or addon libraries need special search paths they can be
3131
# specified here separated by spaces or one per line using +=
32-
ADDON_INCLUDES = "$(SRCROOT)/../../../addons/ofxiOSBoost/libs/boost/include"
32+
ADDON_INCLUDES = "libs/boost/include"
3333

3434
# any special flag that should be passed to the compiler when using this
3535
# addon
@@ -64,6 +64,6 @@ osx:
6464
# binary libraries, these will be usually parsed from the file system but some
6565
# libraries need to passed to the linker in a specific order
6666
ADDON_LIBS =
67-
ADDON_LIBS += libs/boost/lib/ios/boost.a
67+
ADDON_LIBS += libs/boost/lib/ios/libboost.a
6868

6969

scripts/build-libc++.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ ARM_DEV_CMD="xcrun --sdk iphoneos"
9393
SIM_DEV_CMD="xcrun --sdk iphonesimulator"
9494
OSX_DEV_CMD="xcrun --sdk macosx"
9595

96-
ARM_COMBINED_LIB=$IOSBUILDDIR/lib_boost_arm.a
97-
9896
#===============================================================================
9997

10098

@@ -366,7 +364,7 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
366364
$IOSBUILDDIR/arm64/libboost.a \
367365
$IOSBUILDDIR/i386/libboost.a \
368366
$IOSBUILDDIR/x86_64/libboost.a \
369-
-output $OUTPUT_DIR_LIB/boost.a
367+
-output $OUTPUT_DIR_LIB/libboost.a
370368

371369
echo "Completed Fat Lib"
372370
echo "------------------"

scripts/build-libstdc++.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ ARM_DEV_CMD="xcrun --sdk iphoneos"
9393
SIM_DEV_CMD="xcrun --sdk iphonesimulator"
9494
OSX_DEV_CMD="xcrun --sdk macosx"
9595

96-
ARM_COMBINED_LIB=$IOSBUILDDIR/lib_boost_arm.a
97-
9896
#===============================================================================
9997

10098

@@ -367,7 +365,7 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
367365
$IOSBUILDDIR/arm64/libboost.a \
368366
$IOSBUILDDIR/i386/libboost.a \
369367
$IOSBUILDDIR/x86_64/libboost.a \
370-
-output $OUTPUT_DIR_LIB/boost.a
368+
-output $OUTPUT_DIR_LIB/libboost.a
371369

372370
echo "Completed Fat Lib"
373371
echo "------------------"

0 commit comments

Comments
 (0)