diff --git a/.travis.yml b/.travis.yml index 2a914fbd..ee0171e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ before_install: - sudo apt-get -qq update - sudo apt-get install -y groff script: - - ./build-linux.sh + - ./build-linux-64.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index b362fad4..9175183f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 2.8) project (tyrutils) # Grab the git describe output and store it in GIT_DESCRIBE @@ -44,9 +44,14 @@ if (UNIX) endif (UNIX) # set our C/C++ dialects -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_C_STANDARD 99) +if (CMAKE_VERSION VERSION_LESS "3.1") + set (CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}") + set (CMAKE_C_FLAGS "-std=gnu11 ${CMAKE_C_FLAGS}") +else () + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_C_STANDARD 99) +endif () add_definitions(-DTYRUTILS_VERSION=${GIT_DESCRIBE}) diff --git a/README.md b/README.md index d566e54b..dff60c42 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ source code. ## Compiling -Requires CMake 3.1 and a compiler with C99 and C++11 support. +Requires CMake 2.8, groff, and a compiler with C99 and C++11 support. [Embree v2.10.0+](http://embree.github.io/) is optional but recommended. Tested on: @@ -59,6 +59,22 @@ cmake --build . --config Release cpack . ``` +### Ubuntu 14.04 + +``` +sudo apt-get install git cmake build-essential groff + +mkdir build +cd build + +wget https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x86_64.linux.tar.gz -O embree.tgz +tar xf embree.tgz + +cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.11.0.x86_64.linux/lib/cmake/embree-2.11.0" +make -j8 VERBOSE=1 +cpack +``` + ## Credits - Kevin Shanahan (AKA Tyrann) for the original [tyrutils](http://disenchant.net/utils) diff --git a/bspinfo/CMakeLists.txt b/bspinfo/CMakeLists.txt index 484b9303..0695e665 100644 --- a/bspinfo/CMakeLists.txt +++ b/bspinfo/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 2.8) project (bspinfo) set(BSPINFO_SOURCES diff --git a/bsputil/CMakeLists.txt b/bsputil/CMakeLists.txt index 39989032..f22675ed 100644 --- a/bsputil/CMakeLists.txt +++ b/bsputil/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 2.8) project (bsputil) set(BSPUTIL_SOURCES diff --git a/build-linux-64.sh b/build-linux-64.sh new file mode 100755 index 00000000..1e20703e --- /dev/null +++ b/build-linux-64.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -d build ]; then + echo "build already exists, remove it first" + exit 1 +fi + +mkdir build +cd build +wget https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x86_64.linux.tar.gz -O embree.tgz +tar xf embree.tgz +cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.11.0.x86_64.linux/lib/cmake/embree-2.11.0" +make -j8 VERBOSE=1 +cpack + diff --git a/build-linux.sh b/build-linux.sh deleted file mode 100755 index 7e068f6f..00000000 --- a/build-linux.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -BUILD_DIR=build-linux -EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x86_64.linux.tar.gz" -EMBREE_TGZ_NAME=$(basename "$EMBREE_TGZ") -EMBREE_DIR_NAME=$(basename "$EMBREE_TGZ" ".tar.gz") -EMBREE_WITH_VERSION=$(basename "$EMBREE_TGZ" ".x86_64.linux.tar.gz") - -if [ -d "$BUILD_DIR" ]; then - echo "$BUILD_DIR already exists, remove it first" - exit 1 -fi - -mkdir "$BUILD_DIR" -cd "$BUILD_DIR" -wget "$EMBREE_TGZ" -tar xf "$EMBREE_TGZ_NAME" -EMBREE_CMAKE_DIR="$(pwd)/$EMBREE_DIR_NAME/lib/cmake/$EMBREE_WITH_VERSION" -cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_CMAKE_DIR" -make -j8 VERBOSE=1 -cpack - diff --git a/light/CMakeLists.txt b/light/CMakeLists.txt index 35edc8f5..20be90d7 100644 --- a/light/CMakeLists.txt +++ b/light/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 2.8) project (light CXX C) set(LIGHT_INCLUDES diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 83e97c6f..6a54a3ae 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 2.8) project (man) find_program (GROFF groff) diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt index b4457476..19cda132 100644 --- a/qbsp/CMakeLists.txt +++ b/qbsp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 2.8) project (qbsp CXX C) set(QBSP_INCLUDES diff --git a/vis/CMakeLists.txt b/vis/CMakeLists.txt index b68e7bef..653680dd 100644 --- a/vis/CMakeLists.txt +++ b/vis/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 2.8) project (vis) set(VIS_INCLUDES