remove boost from readme and build system

This commit is contained in:
Dane Springmeyer
2014-02-12 13:15:09 -08:00
parent 359a35e60f
commit 7fbb33b5de
4 changed files with 8 additions and 29 deletions

View File

@@ -8,7 +8,7 @@ before_install:
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq
- sudo apt-get -y install gcc-4.8 g++-4.8
- sudo apt-get -y install git cmake make pkg-config libboost-dev libpng-dev
- sudo apt-get -y install git cmake make pkg-config libpng-dev
- sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev
install:

View File

@@ -5,16 +5,16 @@ implemented in C++, targeting iOS & OS X.
## OS X
Install boost, libpng, and [glfw3](http://www.glfw.org/docs/latest/):
Install libpng and [glfw3](http://www.glfw.org/docs/latest/):
```
brew install boost libpng
brew install libpng
brew install homebrew/versions/glfw3
```
Then configure the project:
./configure --boost=`brew --prefix` --glfw3=`brew --prefix` --png=`brew --prefix`
./configure --glfw3=`brew --prefix` --png=`brew --prefix`
See all the options by calling `./configure --help`
@@ -25,7 +25,6 @@ Usage: configure [options]
Options:
-h, --help show this help message and exit
--debug Also build debug build
--boost=BOOST_ROOT Path to boost (defaults to /usr/local)
--glfw3=GLFW3 Path to gflw3 (defaults to using pkg-config)
--png=PNG Path to png (defaults to using pkg-config)
--png-includes=PNG_INCLUDES
@@ -45,10 +44,6 @@ Or generate a dual iOS/OS X-compatible Xcode project for `libllmr` to include as
## iOS
Install boost:
brew install boost
Because `libpng` isn't included in the iOS SDK, you will need to build a cross-architecture version yourself. Run `./ios/setup_libpng.sh`, which is derived from Mapnik's cross-architecture build scripts. This will also run `./configure`.
Then you can build the iOS app with make:
@@ -69,10 +64,6 @@ Install a `-std=c++11` capable compiler
sudo apt-get update
sudo apt-get install gcc-4.8 g++-4.8
Install boost (we only need headers):
sudo apt-get install libboost-dev
Install libpng-dev:
sudo apt-get install libpng-dev

View File

@@ -9,18 +9,15 @@
'cflags':['-std=c++11'],
'configurations': {
'Debug': {
'cflags': [ '-g', '-O0', '-I<(boost_root)/include' ],
'cflags': [ '-g', '-O0' ],
'defines': [ 'DEBUG' ],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '-g', '-I<(boost_root)/include' ]
'OTHER_CPLUSPLUSFLAGS': [ '-g']
}
},
'Release': {
'cflags': [ '-O3', '-I<(boost_root)/include' ],
'defines': [ 'NDEBUG' ],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '-I<(boost_root)/include' ]
}
'cflags': [ '-O3'],
'defines': [ 'NDEBUG' ]
}
}
}

9
configure vendored
View File

@@ -19,11 +19,6 @@ parser.add_option("--debug",
dest="debug",
help="Also build debug build")
parser.add_option("--boost",
action="store",
dest="boost_root",
help="Path to boost (defaults to /usr/local)")
parser.add_option("--glfw3",
action="store",
dest="glfw3",
@@ -60,10 +55,6 @@ def pkg_config(pkg):
return (libs, cflags)
def configure_llmr(o):
if options.boost_root:
o['variables']['boost_root'] = options.boost_root
else:
o['variables']['boost_root'] = '/usr/local'
o['target_defaults']['default_configuration'] = 'Debug' if options.debug else 'Release'
def configure_glfw3(o):