From a2c93026032f2dbce60c75d5744061c014e2f33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Thu, 8 Oct 2020 19:26:45 +0200 Subject: [PATCH] Update build script --- PokittoMake.sh | 4 ++++ README.md | 20 ++++++++++---------- main_sdl.c | 11 ----------- make.sh | 16 +++++++++++++--- 4 files changed, 27 insertions(+), 24 deletions(-) create mode 100755 PokittoMake.sh diff --git a/PokittoMake.sh b/PokittoMake.sh new file mode 100755 index 0000000..47e7a73 --- /dev/null +++ b/PokittoMake.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +clear +make && ../PokittoEmu/BUILD/PokittoEmu BUILD/firmware.bin diff --git a/README.md b/README.md index cf70dc5..d1afde7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ everywhere, made for the benefit of all living beings* - [contributing](#contributing) - [usage rights](#usage-rights) - ## Why this game is special - **Completely public domain (CC0) free softare, free culture, libre game** for the benefit of all living beings in the Universe, **no conoditions on use whatsoever**. **All art is original** work and licensed CC0 (as well as code). @@ -70,13 +69,13 @@ lines of code (80 column wrapping, a lot of empty lines): compiled: -| binary | size | FPS | resolution | RAM usage | -| -------------------- | ------- | ---- | ---------- | ---------- | -| GNU/Linux, SDL | TODO | TODO | TODO | TODO | -| GNU/Linux, terminal | TODO | TODO | TODO | TODO | -| Pokitto | TODO | TODO | TODO | TODO | -| Gamebuino Meta | TODO | TODO | TODO | TODO | -| browser | TODO | TODO | TODO | TODO | +| binary | size | FPS | resolution | RAM usage | +| -------------------- | ------------------------ | ---- | ---------- | ---------- | +| GNU/Linux, SDL | TODO (gcc), TODO (clang) | TODO | TODO | TODO | +| GNU/Linux, terminal | TODO (gcc), TODO (clang) | TODO | TODO | TODO | +| Pokitto | TODO | TODO | TODO | TODO | +| Gamebuino Meta | TODO | TODO | TODO | TODO | +| browser | TODO (JS script) | TODO | TODO | TODO | system requirements: @@ -196,8 +195,9 @@ The game itself can't communicate many values directly – it is just a simple g - [Pacifism](https://en.wikipedia.org/wiki/Anarcho-pacifism), because true effort for equality can't be pursued by violence and other forms of oppression. - [Minimalism](https://suckless.org/philosophy/) and simplicity, in technology and elsewhere, as a means of freedom and beauty. - [Software](https://en.wikipedia.org/wiki/Free_software), [cultural](https://en.wikipedia.org/wiki/Free-culture_movement) and information freedom, opposition to intellectual property. -- Future proof software. -- Selflessness, sharing. +- Future proof technology. +- Vegetarianism, veganism, equality of life forms. +- Selflessness, sharing, collaboration, caring about others. ### Why ray casting and not e.g. BSP? diff --git a/main_sdl.c b/main_sdl.c index 72a9b5f..ae6e2aa 100644 --- a/main_sdl.c +++ b/main_sdl.c @@ -313,17 +313,6 @@ static inline int16_t mixSamples(int16_t sample1, int16_t sample2) uint8_t musicOn = 1; - -uint8_t aaa[] = -{ -14, -7, -248, -148, -6, -8 -}; - void audioFillCallback(void *userdata, uint8_t *s, int l) { uint16_t *s16 = (uint16_t *) s; diff --git a/make.sh b/make.sh index 0b85e13..5936493 100755 --- a/make.sh +++ b/make.sh @@ -1,9 +1,13 @@ # Build script for Anarch. # by drummyfish, released under CC0 1.0, public domain +# +# usage: +# +# ./make.sh platform [compiler] #!/bin/bash -if [ $# -ne 1 ]; then +if [ $# -lt 1 ]; then echo "need a parameter (sdl, pokitto, gb, emscripten, ...)" exit 0 fi @@ -12,17 +16,23 @@ clear; clear; C_FLAGS='-x c -Wall -Wextra -fmax-errors=5 -pedantic -O3 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -o game' +COMPILER='g++' + +if [ $# -eq 2 ]; then + COMPILER=$2 +fi + if [ $1 == "sdl" ]; then # PC SDL build, requires: # - g++ # - SDL2 (dev) package - g++ ${C_FLAGS} main_sdl.c -lSDL2 2>&1 >/dev/null && ./game + ${COMPILER} ${C_FLAGS} main_sdl.c -lSDL2 2>&1 >/dev/null && ./game elif [ $1 == "terminal" ]; then # PC terminal build, requires: # - g++ - g++ ${C_FLAGS} main_terminal.c 2>&1 >/dev/null && ./game + ${COMPILER} ${C_FLAGS} main_terminal.c 2>&1 >/dev/null && ./game elif [ $1 == "pokitto" ]; then # Pokitto build, requires: # - PokittoLib, in this folder create a symlink named "PokittoLib" to the