Skip to content

Commit b48ab72

Browse files
committed
Merge branch 'build-yourself' - Added libstdc++ Build script into master as well.
2 parents 70583b8 + e79b88e commit b48ab72

File tree

8 files changed

+621
-6
lines changed

8 files changed

+621
-6
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ language: objective-c
22
compiler: clang
33
before-script:
44
script:
5-
- scripts/build.sh
5+
- scripts/build-libc++.sh
6+
- scripts/cleanAll.sh
7+
- scripts/build-libstdc++.sh
8+
- scripts/cleanAll.sh

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- Check Branches for others or to be specific
1010
- Designed for use as an open frameworks addon, however should definitely work for other iOS projects
1111
- Built with clang++ and using libc++ and std=c++11
12+
- Alternate release with libstdc++
1213
- License: See Boost License [LICENSE.MD](https://github.com/danoli3/ofxiOSBoost/blob/master/LICENSE.md)
1314

1415
============
@@ -37,7 +38,6 @@ If not openFrameworks just add the ``` libs/boost/include ``` to Header Search P
3738
============
3839

3940
### Architectures in Pre-Build Library (Fat Lib)
40-
See the other branches on this repository (All libc++ std=c11)
4141

4242
- arm64 : (iOS 7, 8 64bit only) [iPhone 5S, iPhone 6, iPhone 6 Plus, iPad Air, Retina iPad Mini]
4343
- armv7s : (iOS 6-7) [iPhone 5, iPhone 5c, iPad 4]
@@ -60,9 +60,15 @@ See the other branches on this repository (All libc++ std=c11)
6060

6161

6262
- Download files (suggested you download the files to addons/ofxiOSBoost for openFrameworks)
63-
- Double click and run scripts/build.command (this will download the 1.56.0 version of boost and begin compiling the library).
63+
- Double click and run ```scripts/build-libc++.command``` (this will download the 1.56.0 version of boost and begin compiling the library).
6464
- Once completed in the terminal continue with the next steps.
65-
- Add the ofxiOSBoost to your project (src and libs for your chosen architecture)
65+
- Add the ofxiOSBoost to your project (src and libs for your chosen architecture)`
66+
67+
#### Alternative Build Script:
68+
- Build using libstdc++ by running the ```scripts/build-libstdc++.command```
69+
70+
#### Clean script
71+
- Run the clean script from ```scripts/cleanAll.command``` to remove pre-compiled code and the final built library
6672

6773

6874

scripts/build-libc++.command

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
here="`dirname \"$0\"`"
4+
echo "cd-ing to $here"
5+
cd "$here" || exit 1
6+
7+
./build-libc++.sh
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#===============================================================================
2-
# Filename: boost.sh
2+
# Filename: build-libc++.sh
33
# Author: Pete Goodliffe, Daniel Rosser
44
# Copyright: (c) Copyright 2009 Pete Goodliffe, 2013 Daniel Rosser
55
# Licence: Please feel free to use this, with attribution

scripts/build-libstdc++.command

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
here="`dirname \"$0\"`"
4+
echo "cd-ing to $here"
5+
cd "$here" || exit 1
6+
7+
./build-libstdc++.sh

0 commit comments

Comments
 (0)