mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2026-03-16 10:09:43 +00:00
Eliminate autotools/automake/configure.
This commit is contained in:
6
.github/workflows/build.sh
vendored
6
.github/workflows/build.sh
vendored
@@ -2,7 +2,6 @@ set -x -e o pipefail
|
||||
|
||||
|
||||
GH_MYMAKE_ARGS="-fPIC"
|
||||
GH_AUTOTOOLS_CXXFLAGS="-W -Wall -Wextra -Wno-unused-parameter -Wno-maybe-uninitialized"
|
||||
|
||||
HYPERROGUE_USE_GLEW=$GH_HYP_GLEW
|
||||
export HYPERROGUE_USE_GLEW=${HYPERROGUE_USE_GLEW: -1}
|
||||
@@ -14,7 +13,6 @@ HYPERROGUE_USE_ROGUEVIZ=$GH_HYP_RVIZ
|
||||
export HYPERROGUE_USE_ROGUEVIZ=${HYPERROGUE_USE_ROGUEVIZ: -1}
|
||||
if [[ "$GH_HYP_RVIZ" == "rviz_1" ]]; then
|
||||
GH_MYMAKE_ARGS+=" -std=c++17 -rv"
|
||||
GH_AUTOTOOLS_CXXFLAGS+=" -std=c++17 -DCAP_ROGUEVIZ=1"
|
||||
fi
|
||||
|
||||
export CC=$GH_COMPILER
|
||||
@@ -22,10 +20,6 @@ export CXX=${CC%cc}++
|
||||
|
||||
if [[ "$GH_BUILDSYS" == "makefile" ]]; then
|
||||
make -f Makefile.simple
|
||||
elif [[ "$GH_BUILDSYS" == "autotools" ]]; then
|
||||
autoreconf -vfi
|
||||
./configure CXXFLAGS="${GH_AUTOTOOLS_CXXFLAGS}"
|
||||
make
|
||||
elif [[ "$GH_BUILDSYS" == "mymake" ]]; then
|
||||
make -f Makefile.simple mymake
|
||||
./mymake $GH_MYMAKE_ARGS
|
||||
|
||||
4
.github/workflows/github_ci.yml
vendored
4
.github/workflows/github_ci.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest]
|
||||
compiler: [gcc, clang]
|
||||
build_system: [makefile, autotools, mymake]
|
||||
build_system: [makefile, mymake]
|
||||
hyper_use_rviz: [rviz_1, rviz_0]
|
||||
hyper_use_png: [png_1]
|
||||
hyper_use_glew: [glew_1]
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
compiler: [gcc]
|
||||
build_system: [makefile, autotools, mymake]
|
||||
build_system: [makefile, mymake]
|
||||
hyper_use_rviz: [rviz_1, rviz_0]
|
||||
hyper_use_png: [png_1]
|
||||
hyper_use_glew: [glew_1]
|
||||
|
||||
6
.github/workflows/install_deps.sh
vendored
6
.github/workflows/install_deps.sh
vendored
@@ -17,12 +17,6 @@ if [[ "$GH_HYP_PNG" == "png_1" ]]; then
|
||||
GH_DEPS_MINGW64+=" libpng:x"
|
||||
fi
|
||||
|
||||
if [[ "$GH_BUILDSYS" == "autotools" ]]; then
|
||||
GH_DEPS_UBUNTU+=" autoconf"
|
||||
GH_DEPS_MACOS+=" automake"
|
||||
GH_DEPS_MINGW64+=" automake-wrapper autoconf"
|
||||
fi
|
||||
|
||||
if [[ "$GH_OS" == "ubuntu-latest" ]]; then
|
||||
sudo apt-get -y install $GH_DEPS_UBUNTU
|
||||
elif [[ "$GH_OS" == "macos-latest" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user