-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: 1.4.0 Add WIP raylib build (#65)
- Add --enable-raylib config option - Add --enable-anvilpick config option - Set repo_invil default for darwin - Use repo_invil default when using interactive selection for anvil - Add -V to print build info - Add WIP raylib build - Add helapordo_build_string - Update PACK_NAME to $(TARGET)-$(HL_BUILD_STR)-$(VERSION)-$(OS)-$(MACHINE) - Add clock_t start_time to Gamestate - Add timer under G_EXPERIMENTAL_ON for Enemy, Boss rooms - Print build in title screen - Add mandatory define for build (mutually exclusive, HELAPORDO_CURSES_BUILD or HELAPORDO_RAYLIB_BUILD) - Add hlpd_dbg_features() - Bump s4c to 0.4.2 - Bump amboso to 2.0.1 --------- Signed-off-by: jgabaut <[email protected]>
- Loading branch information
Showing
34 changed files
with
2,295 additions
and
448 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,3 +59,6 @@ static/animations/*.txt | |
|
|
||
| # ignore anvil symlink | ||
| anvil | ||
|
|
||
| # ignore anvil.log | ||
| anvil.log | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule amboso
updated
7 files
| +2 −2 | Makefile | |
| +4 −4 | amboso | |
| +35 −9 | amboso_fn.sh | |
| +1 −0 | bin/stego.lock | |
| +3 −0 | bin/v2.0.1/.gitignore | |
| +2 −2 | kazoj/bone/try_amboso_sourcing.k | |
| +1 −1 | kazoj/bone/try_amboso_sourcing.k.stderr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #amboso compliant version folder, will ignore everything inside BUT the gitignore, to keep the clean dir | ||
| #we also keep specific dependencies... | ||
| * | ||
| !.gitignore | ||
| !static |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../static/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # Define the package name and version | ||
| AC_INIT([helapordo], [1.3.6], [[email protected]]) | ||
| AC_INIT([helapordo], [1.4.0], [[email protected]]) | ||
|
|
||
| # Verify automake version and enable foreign option | ||
| AM_INIT_AUTOMAKE([foreign -Wall]) | ||
|
|
@@ -11,6 +11,9 @@ build_windows=no | |
| build_mac=no | ||
| build_anvilpick=no | ||
|
|
||
| build_curses=yes | ||
| build_raylib=no | ||
|
|
||
| # Check for the --enable-debug option | ||
| AC_ARG_ENABLE([debug], | ||
| [AS_HELP_STRING([--enable-debug], [Enable debug build])], | ||
|
|
@@ -26,64 +29,138 @@ AC_ARG_ENABLE([anvilpick], | |
| [enable_anvilpick=$enableval], | ||
| [enable_anvilpick=no]) | ||
|
|
||
| AC_ARG_ENABLE([raylib], | ||
| [AS_HELP_STRING([--enable-raylib], [Enable raylib build])], | ||
| [enable_raylib=$enableval], | ||
| [enable_raylib=no]) | ||
|
|
||
| # Define the include and library paths based on the host system | ||
| case "${host_os}" in | ||
| mingw*) | ||
| # mingw32 specific flags | ||
| echo "Building for mingw32: [$host_cpu-$host_vendor-$host_os]" | ||
| build_windows=yes | ||
| # mingw32 specific flags | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -fstack-protector -DWINDOWS_BUILD -DKOLISEO_HAS_CURSES -DNCURSES_STATIC"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lpanelw -lmenuw -lncursesw -static"]) | ||
| AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"]) | ||
| AC_SUBST([OS], ["w64-mingw32"]) | ||
| AC_SUBST([TARGET], ["helapordo.exe"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_amboso"]) | ||
| if test "$enable_raylib" = "yes"; then | ||
| echo "Building with raylib" | ||
| build_raylib=yes | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -fstack-protector -DWINDOWS_BUILD -DS4C_RAYLIB_EXTENSION"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lraylib -lm -lgdi32 -lwinmm -static"]) | ||
| AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"]) | ||
| AC_SUBST([OS], ["w64-mingw32"]) | ||
| AC_SUBST([TARGET], ["helapordo.exe"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_invil"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_amboso"]) | ||
| fi | ||
| AC_SUBST([HL_BUILD_STR], ["rl"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_amboso"]) | ||
| echo "Building with ncurses" | ||
| #build_raylib=no | ||
| #build_curses=yes | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -fstack-protector -DWINDOWS_BUILD -DKOLISEO_HAS_CURSES -DNCURSES_STATIC"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lpanelw -lmenuw -lncursesw -static"]) | ||
| AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"]) | ||
| AC_SUBST([OS], ["w64-mingw32"]) | ||
| AC_SUBST([TARGET], ["helapordo.exe"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_invil"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_amboso"]) | ||
| fi | ||
| AC_SUBST([HL_BUILD_STR], ["nc"]) | ||
| fi | ||
| ;; | ||
| darwin*) | ||
| # macOS specific flags | ||
| echo "Building for macos: [$host_cpu-$host_vendor-$host_os]" | ||
| build_mac=yes | ||
| # macOS specific flags | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-I/opt/homebrew/opt/ncurses/include -DKOLISEO_HAS_CURSES"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-L/opt/homebrew/opt/ncurses/lib -lmenu -lpanel -lncurses"]) | ||
| AC_SUBST([OS], ["darwin"]) | ||
| AC_SUBST([TARGET], ["helapordo"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_invil"]) | ||
| if test "$enable_raylib" = "yes"; then | ||
| echo "Building with raylib" | ||
| build_raylib=yes | ||
| build_curses=no | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-I/opt/homebrew/opt/raylib/include -DS4C_RAYLIB_EXTENSION"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-L/opt/homebrew/opt/raylib/lib -lraylib"]) | ||
| AC_SUBST([OS], ["darwin"]) | ||
| AC_SUBST([TARGET], ["helapordo"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_invil"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_invil"]) | ||
| fi | ||
| AC_SUBST([HL_BUILD_STR], ["rl"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_invil"]) | ||
| echo "Building with ncurses" | ||
| #build_raylib=no | ||
| #build_curses=yes | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-I/opt/homebrew/opt/ncurses/include -DKOLISEO_HAS_CURSES"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-L/opt/homebrew/opt/ncurses/lib -lmenu -lpanel -lncurses"]) | ||
| AC_SUBST([OS], ["darwin"]) | ||
| AC_SUBST([TARGET], ["helapordo"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_invil"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_invil"]) | ||
| fi | ||
| AC_SUBST([HL_BUILD_STR], ["nc"]) | ||
| fi | ||
| ;; | ||
| linux*) | ||
| # Linux specific flags | ||
| echo "Building for Linux: [$host_cpu-$host_vendor-$host_os]" | ||
| build_linux=yes | ||
| # Linux specific flags | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-DKOLISEO_HAS_CURSES"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-lmenu -lpanel -lncurses"]) | ||
| AC_SUBST([OS], ["Linux"]) | ||
| AC_SUBST([CCOMP], ["gcc"]) #Yes | ||
| AC_SUBST([TARGET], ["helapordo"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_amboso"]) | ||
| if test "$enable_raylib" = "yes"; then | ||
| echo "Building with raylib" | ||
| build_raylib=yes | ||
| build_curses=no | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-DS4C_RAYLIB_EXTENSION"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-lraylib"]) | ||
| AC_SUBST([OS], ["Linux"]) | ||
| AC_SUBST([CCOMP], ["gcc"]) #Yes | ||
| AC_SUBST([TARGET], ["helapordo"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_invil"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_amboso"]) | ||
| fi | ||
| AC_SUBST([HL_BUILD_STR], ["rl"]) | ||
|
|
||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_amboso"]) | ||
| echo "Building with ncurses" | ||
| #build_raylib=no | ||
| #build_curses=yes | ||
| AC_SUBST([HELAPORDO_CFLAGS], ["-DKOLISEO_HAS_CURSES"]) | ||
| AC_SUBST([HELAPORDO_LDFLAGS], ["-lmenu -lpanel -lncurses"]) | ||
| AC_SUBST([OS], ["Linux"]) | ||
| AC_SUBST([CCOMP], ["gcc"]) #Yes | ||
| AC_SUBST([TARGET], ["helapordo"]) | ||
| if test "$enable_anvilpick" = "yes"; then | ||
| echo "Building with anvil interactive selection" | ||
| build_anvilpick=yes | ||
| AC_SUBST([ANVIL_IMPL], ["-i repo_invil"]) | ||
| else | ||
| AC_SUBST([ANVIL_IMPL], ["repo_amboso"]) | ||
| fi | ||
| AC_SUBST([HL_BUILD_STR], ["nc"]) | ||
| fi | ||
| ;; | ||
| *) | ||
| AC_MSG_ERROR(["OS $host_os is not supported"]) | ||
| ;; | ||
| esac | ||
|
|
||
| AM_CONDITIONAL([HL_RAYLIB_BUILD], [test "$build_raylib" = "yes"]) | ||
| AM_CONDITIONAL([HL_CURSES_BUILD], [test "$build_curses" = "yes"]) | ||
| AM_CONDITIONAL([ANVILPICK_BUILD], [test "$build_anvilpick" = "yes"]) | ||
| AM_CONDITIONAL([WINDOWS_BUILD], [test "$build_windows" = "yes"]) | ||
| AM_CONDITIONAL([DARWIN_BUILD], [test "$build_mac" = "yes"]) | ||
|
|
@@ -92,7 +169,7 @@ AM_CONDITIONAL([LINUX_BUILD], [test "$build_linux" = "yes"]) | |
| # Set a default version number if not specified externally | ||
| AC_ARG_VAR([VERSION], [Version number]) | ||
| if test -z "$VERSION"; then | ||
| VERSION="1.3.6" | ||
| VERSION="1.4.0" | ||
| fi | ||
|
|
||
| # Output variables to the config.h header | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule invil
updated
6 files
| +10 −0 | CHANGELOG.md | |
| +5 −5 | Cargo.lock | |
| +2 −2 | Cargo.toml | |
| +3 −2 | README.md | |
| +37 −0 | bench/gitmode-0.2.3-bench.md | |
| +2 −2 | src/core.rs |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.