mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-24 01:00:25 +00:00
Move Makefile.simple
to just Makefile
.
This commit is contained in:
parent
77cc0cc01b
commit
4c10b17b7e
4
.github/workflows/build.sh
vendored
4
.github/workflows/build.sh
vendored
@ -19,9 +19,9 @@ export CC=$GH_COMPILER
|
||||
export CXX=${CC%cc}++
|
||||
|
||||
if [[ "$GH_BUILDSYS" == "makefile" ]]; then
|
||||
make -f Makefile.simple
|
||||
make
|
||||
elif [[ "$GH_BUILDSYS" == "mymake" ]]; then
|
||||
make -f Makefile.simple mymake
|
||||
make mymake
|
||||
./mymake $GH_MYMAKE_ARGS
|
||||
mv hyper hyperrogue
|
||||
else
|
||||
|
2
.github/workflows/github_ci.yml
vendored
2
.github/workflows/github_ci.yml
vendored
@ -77,7 +77,7 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Build
|
||||
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
|
||||
run: |
|
||||
ls -lAF hyper.html hyper.js hyper.wasm
|
||||
|
10
.travis.yml
10
.travis.yml
@ -155,7 +155,7 @@ before_install:
|
||||
|
||||
script:
|
||||
- |-
|
||||
make -f Makefile.simple clean
|
||||
make clean
|
||||
if [[ "$(git status --porcelain)" ]]; then
|
||||
git status
|
||||
exit 'A build artifact was committed; git rm it and try again'
|
||||
@ -163,9 +163,9 @@ script:
|
||||
- |-
|
||||
# Build hyperrogue.
|
||||
if [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then
|
||||
make -f Makefile.simple
|
||||
make
|
||||
elif [[ "$TRAVIS_BUILD_SYSTEM" == "mymake" ]]; then
|
||||
make -f Makefile.simple mymake
|
||||
make mymake
|
||||
if [[ "$HYPERROGUE_USE_ROGUEVIZ" == "1" ]]; then
|
||||
./mymake -rv
|
||||
else
|
||||
@ -173,7 +173,7 @@ script:
|
||||
fi
|
||||
mv hyper hyperrogue
|
||||
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
|
||||
exit 'Unsupported build system'
|
||||
fi
|
||||
@ -185,7 +185,7 @@ script:
|
||||
./hyperrogue --help
|
||||
fi
|
||||
- |-
|
||||
make -f Makefile.simple clean
|
||||
make clean
|
||||
if [[ "$(git status --porcelain)" ]]; then
|
||||
git status
|
||||
exit 'make clean did not return the repository to its pre-build state'
|
||||
|
@ -5,16 +5,16 @@
|
||||
# Run "brew install sdl_gfx".
|
||||
# Run "brew install sdl_mixer".
|
||||
# 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:
|
||||
# You might need to run commands such as "pacman -S mingw-w64-x86_64-SDL"
|
||||
# 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:
|
||||
# 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)
|
@ -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
|
||||
git clone https://github.com/zenorogue/hyperrogue.git 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.
|
||||
|
@ -12,7 +12,7 @@ mkdir -p app/src/main/res/raw/
|
||||
if [ ! -f ../autohdr.h ]; then
|
||||
echo "generating autohdr.h..."
|
||||
LAST_PWD=$(pwd); cd ..
|
||||
make -f Makefile.simple autohdr.h
|
||||
make autohdr.h
|
||||
cd $LAST_PWD
|
||||
fi
|
||||
|
||||
|
@ -145,7 +145,7 @@ string setdir = "../";
|
||||
int main(int argc, char **argv) {
|
||||
set_os(os);
|
||||
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)) {
|
||||
retval = mysystem("make -f " + fname + " language-data.cpp autohdr.h");
|
||||
if (retval) { printf("error during preparation!\n"); exit(retval); }
|
||||
|
Loading…
Reference in New Issue
Block a user