mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

Move Makefile.simple to just Makefile.

Browse Source
This commit is contained in:
Arthur O'Dwyer 2021-03-21 17:40:06 -04:00
parent 77cc0cc01b
commit 4c10b17b7e
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.sh vendored
View File

@ -19,9 +19,9 @@ export CC=$GH_COMPILER
export CXX=${CC%cc}++ export CXX=${CC%cc}++
if [[ "$GH_BUILDSYS" == "makefile" ]]; then if [[ "$GH_BUILDSYS" == "makefile" ]]; then
make -f Makefile.simple make
elif [[ "$GH_BUILDSYS" == "mymake" ]]; then elif [[ "$GH_BUILDSYS" == "mymake" ]]; then
make -f Makefile.simple mymake make mymake
./mymake $GH_MYMAKE_ARGS ./mymake $GH_MYMAKE_ARGS
mv hyper hyperrogue mv hyper hyperrogue
else else

2
.github/workflows/github_ci.yml vendored
View File

@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Build - name: Build
run: | run: |
docker run --rm -v $(pwd):/src trzeci/emscripten make -f Makefile.simple emscripten docker run --rm -v $(pwd):/src trzeci/emscripten make emscripten
- name: Do a simple test - name: Do a simple test
run: | run: |
ls -lAF hyper.html hyper.js hyper.wasm ls -lAF hyper.html hyper.js hyper.wasm

10
.travis.yml
View File

@ -155,7 +155,7 @@ before_install:
script: script:
- |- - |-
make -f Makefile.simple clean make clean
if [[ "$(git status --porcelain)" ]]; then if [[ "$(git status --porcelain)" ]]; then
git status git status
exit 'A build artifact was committed; git rm it and try again' exit 'A build artifact was committed; git rm it and try again'
@ -163,9 +163,9 @@ script:
- |- - |-
# Build hyperrogue. # Build hyperrogue.
if [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then if [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then
make -f Makefile.simple make
elif [[ "$TRAVIS_BUILD_SYSTEM" == "mymake" ]]; then elif [[ "$TRAVIS_BUILD_SYSTEM" == "mymake" ]]; then
make -f Makefile.simple mymake make mymake
if [[ "$HYPERROGUE_USE_ROGUEVIZ" == "1" ]]; then if [[ "$HYPERROGUE_USE_ROGUEVIZ" == "1" ]]; then
./mymake -rv ./mymake -rv
else else
@ -173,7 +173,7 @@ script:
fi fi
mv hyper hyperrogue mv hyper hyperrogue
elif [[ "$TRAVIS_BUILD_SYSTEM" == "emscripten" ]]; then elif [[ "$TRAVIS_BUILD_SYSTEM" == "emscripten" ]]; then
docker run --rm -v $(pwd):/src trzeci/emscripten make -f Makefile.simple emscripten docker run --rm -v $(pwd):/src trzeci/emscripten make emscripten
else else
exit 'Unsupported build system' exit 'Unsupported build system'
fi fi
@ -185,7 +185,7 @@ script:
./hyperrogue --help ./hyperrogue --help
fi fi
- |- - |-
make -f Makefile.simple clean make clean
if [[ "$(git status --porcelain)" ]]; then if [[ "$(git status --porcelain)" ]]; then
git status git status
exit 'make clean did not return the repository to its pre-build state' exit 'make clean did not return the repository to its pre-build state'

6
Makefile.simple → Makefile
View File

@ -5,16 +5,16 @@
# Run "brew install sdl_gfx". # Run "brew install sdl_gfx".
# Run "brew install sdl_mixer". # Run "brew install sdl_mixer".
# Run "brew install sdl_ttf". # Run "brew install sdl_ttf".
# Run "make -f Makefile.simple" to build HyperRogue as ./hyperrogue. # Run "make" to build HyperRogue as ./hyperrogue.
# #
# For MSYS2 and MinGW-w64: # For MSYS2 and MinGW-w64:
# You might need to run commands such as "pacman -S mingw-w64-x86_64-SDL" # You might need to run commands such as "pacman -S mingw-w64-x86_64-SDL"
# to install SDL and other required libraries. # to install SDL and other required libraries.
# Run "make -f Makefile.simple" to build HyperRogue as ./hyperrogue.exe. # Run "make" to build HyperRogue as ./hyperrogue.exe.
# #
# For Ubuntu Linux: # For Ubuntu Linux:
# Run "sudo apt-get install libsdl-dev" to install SDL in /usr/local. # Run "sudo apt-get install libsdl-dev" to install SDL in /usr/local.
# Run "make -f Makefile.simple" to build HyperRogue as ./hyperrogue. # Run "make" to build HyperRogue as ./hyperrogue.
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)

2
README.md
View File

@ -59,7 +59,7 @@ You should be able to compile on Linux, OSX, or MinGW with something like this (
sudo apt-get install gcc libsdl1.2-dev libsdl-ttf2.0-dev libsdl-gfx1.2-dev sudo apt-get install gcc libsdl1.2-dev libsdl-ttf2.0-dev libsdl-gfx1.2-dev
git clone https://github.com/zenorogue/hyperrogue.git hyperrogue git clone https://github.com/zenorogue/hyperrogue.git hyperrogue
cd hyperrogue cd hyperrogue
make -f Makefile.simple make
``` ```
The `mymake` program builds HyperRogue in parts. It takes longer than the method shown above, but when you change something, `mymake` will only recompile the changed file. The `mymake` program builds HyperRogue in parts. It takes longer than the method shown above, but when you change something, `mymake` will only recompile the changed file.

2
hyperroid/copy.sh
View File

@ -12,7 +12,7 @@ mkdir -p app/src/main/res/raw/
if [ ! -f ../autohdr.h ]; then if [ ! -f ../autohdr.h ]; then
echo "generating autohdr.h..." echo "generating autohdr.h..."
LAST_PWD=$(pwd); cd .. LAST_PWD=$(pwd); cd ..
make -f Makefile.simple autohdr.h make autohdr.h
cd $LAST_PWD cd $LAST_PWD
fi fi

2
mymake.cpp
View File

@ -145,7 +145,7 @@ string setdir = "../";
int main(int argc, char **argv) { int main(int argc, char **argv) {
set_os(os); set_os(os);
int retval = 0; // for storing return values of some function calls int retval = 0; // for storing return values of some function calls
for(string fname: {"Makefile.loc", "Makefile.simple", "Makefile"}) for(string fname: {"Makefile.loc", "Makefile"})
if(file_exists(fname)) { if(file_exists(fname)) {
retval = mysystem("make -f " + fname + " language-data.cpp autohdr.h"); retval = mysystem("make -f " + fname + " language-data.cpp autohdr.h");
if (retval) { printf("error during preparation!\n"); exit(retval); } if (retval) { printf("error during preparation!\n"); exit(retval); }