Unified · Split
| @@ -13,21 +13,22 @@ Prerequisites · 12 unmodified lines | ||
| 13 | 13 | ------------- |
| 14 | 14 | |
| 15 | 15 | - Linux or Mac OS X |
| 16 | −- boost, if using gcc 4.8 or earlier to compile on Linux | |
| 16 | +- boost | |
| 17 | 17 | - CMake 2.8 |
| 18 | 18 | - GCC dependencies: GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+ |
| 19 | +- bison version 3.0.2 or later | |
| 19 | 20 | - Apple Universal Interfaces (tested with version 3.1 - see below) |
| 20 | 21 | - An ancient Mac and/or an emulator. |
| 21 | 22 | |
| 22 | 23 | For Ubuntu Linux, the following should help a bit: |
| 23 | 24 | |
| 24 | − sudo apt-get install cmake libgmp-dev libmpfr-dev libmpc-dev | |
| 25 | + sudo apt-get install cmake libgmp-dev libmpfr-dev libmpc-dev libboost-all-dev bison | |
| 25 | 26 | |
| 26 | 27 | On a Mac, get the homebrew package manager and: |
| 27 | 28 | |
| 28 | − brew install cmake gmp mpfr libmpc | |
| 29 | + brew install cmake gmp mpfr libmpc boost bison | |
| 29 | 30 | |
| 30 | −You can also run Retro68 on a PowerMac G4 or G5 running Mac OS 10.4 (Tiger). | |
| 31 | +In theory, you can also run Retro68 on a PowerMac G4 or G5 running Mac OS 10.4 (Tiger). | |
| 31 | 32 | In that case, get the tigerbrew package manager and |
| 32 | 33 | |
| 33 | 34 | brew install gcc cmake |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | cmake_minimum_required(VERSION 2.8) |
| 19 | 19 | set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Werror=return-type") |
| 20 | 20 | |
| 21 | −find_package(Boost COMPONENTS filesystem system) | |
| 21 | +find_package(Boost COMPONENTS filesystem system REQUIRED) | |
| 22 | 22 | |
| 23 | 23 | add_library(ResourceFiles |
| 24 | 24 | ResourceFork.h ResourceFork.cc |
| @@ -21,9 +21,11 @@ set(CMAKE_CXX_FLAGS "--std=c++11 -Wall") · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | find_package(Boost COMPONENTS wave filesystem system thread regex program_options) |
| 23 | 23 | |
| 24 | −if(Boost_FOUND) | |
| 24 | +set(CMAKE_PROGRAM_PATH $CMAKE_PROGRAM_PATH "/usr/local/opt/bison/bin") | |
| 25 | +find_package(BISON 3.0.2) | |
| 26 | + | |
| 27 | +if(Boost_FOUND AND BISON_FOUND) | |
| 25 | 28 | |
| 26 | −find_package(BISON REQUIRED) | |
| 27 | 29 | |
| 28 | 30 | include_directories(. ${CMAKE_CURRENT_BINARY_DIR}) |
| 29 | 31 | |
| @@ -68,4 +70,6 @@ install(TARGETS Rez RUNTIME DESTINATION bin) · 38 unmodified lines | ||
| 68 | 70 | |
| 69 | 71 | add_subdirectory(Test) |
| 70 | 72 | |
| 71 | −endif(Boost_FOUND) | |
| 73 | +else(Boost_FOUND AND BISON_FOUND) | |
| 74 | + message(WARNING "Rez compiler will not be built; both boost and Bison 3.0.2 are required") | |
| 75 | +endif(Boost_FOUND AND BISON_FOUND) | |