Skip to content

Commit

Permalink
feat: 0.3.18 invil 0.1.6, add kls_dbg_features() (#58)
Browse files Browse the repository at this point in the history
* chore: move AM_CONDITIONAL

* feat: add kls_dbg_features(), bump invil

* fix: should stabilize ./anvil -i
  • Loading branch information
jgabaut authored Dec 17, 2023
1 parent 6116d34 commit 4c964af
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 13 deletions.
1 change: 1 addition & 0 deletions bin/stego.lock
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ testsdir = "ok"
"0.3.12" = "Bump amboso to 1.9.6"
"0.3.13" = "Bump amboso to 1.9.7, add invil"
"0.3.17" = "Global lib install, config options, invil 0.1.5"
"0.3.18" = "invil 0.1.6, fixes broken ./anvil -i"
4 changes: 4 additions & 0 deletions bin/v0.3.18/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#amboso compliant version folder, will ignore everything inside BUT the gitignore, to keep the clean dir
*
!.gitignore
!static
1 change: 1 addition & 0 deletions bin/v0.3.18/static
18 changes: 9 additions & 9 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Define the package name and version
AC_INIT([koliseo], [0.3.17], [[email protected]])
AC_INIT([koliseo], [0.3.18], [[email protected]])

# Verify automake version and enable foreign option
AM_INIT_AUTOMAKE([foreign -Wall])
Expand All @@ -23,18 +23,20 @@ AC_ARG_ENABLE([gulp],
[enable_gulp=$enableval],
[enable_gulp=no])
AM_CONDITIONAL([DEBUG_BUILD], [test "$enable_debug" = "yes"])
AM_CONDITIONAL([CURSES_BUILD], [test "$enable_curses" = "yes"])
AM_CONDITIONAL([GULP_BUILD], [test "$enable_gulp" = "yes"])

# Define the include and library paths based on the host system
if test "$host_os" = "mingw32"; then
echo "Building for mingw32: [$host_cpu-$host_vendor-$host_os]"
# mingw32 specific flags
if test "$enable_curses" = "yes"; then
echo "Building with curses header"
AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD -DNCURSES_STATIC"])
AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lncursesw"])
echo "Building with curses header"
AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD -DNCURSES_STATIC"])
AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lncursesw"])
else
AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD"])
AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib"])
AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD"])
AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib"])
fi
AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"])
AC_SUBST([OS], ["w64-mingw32"])
Expand Down Expand Up @@ -67,13 +69,11 @@ if test "$host_os" = "linux-gnu"; then
AC_SUBST([OS], ["Linux"])
AC_SUBST([TARGET], ["demo"])
fi
AM_CONDITIONAL([CURSES_BUILD], [test "$enable_curses" = "yes"])
AM_CONDITIONAL([GULP_BUILD], [test "$enable_gulp" = "yes"])

# Set a default version number if not specified externally
AC_ARG_VAR([VERSION], [Version number])
if test -z "$VERSION"; then
VERSION="0.3.17"
VERSION="0.3.18"
fi

# Output variables to the config.h header
Expand Down
2 changes: 1 addition & 1 deletion docs/koliseo.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PROJECT_NAME = "koliseo"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "0.3.17"
PROJECT_NUMBER = "0.3.18"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion invil
22 changes: 22 additions & 0 deletions src/koliseo.c
Original file line number Diff line number Diff line change
Expand Up @@ -2623,6 +2623,28 @@ void kls_temp_end(Koliseo_Temp *tmp_kls)
}
}

/**
* Prints enabled Koliseo features to stderr.
*/
void kls_dbg_features(void)
{
#ifdef KOLISEO_HAS_CURSES
fprintf(stderr, "[KLS] ncurses.h integration is enabled\n");
#else
fprintf(stderr, "[KLS] ncurses.h integration is not enabled\n");
#endif
#ifdef KOLISEO_HAS_GULP
fprintf(stderr, "[KLS] KLS_GULP is enabled\n");
#else
fprintf(stderr, "[KLS] KLS_GULP is not enabled\n");
#endif
#ifdef KLS_DEBUG_CORE
fprintf(stderr, "[KLS] Koliseo core debugging is enabled\n");
#else
fprintf(stderr, "[KLS] Koliseo core debugging is not enabled\n");
#endif
}

KLS_Region_List kls_emptyList(void)
{
return NULL;
Expand Down
5 changes: 3 additions & 2 deletions src/koliseo.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#define KLS_MAJOR 0 /**< Represents current major release.*/
#define KLS_MINOR 3 /**< Represents current minor release.*/
#define KLS_PATCH 17 /**< Represents current patch release.*/
#define KLS_PATCH 18 /**< Represents current patch release.*/

/*! \mainpage Koliseo index page
*
Expand Down Expand Up @@ -183,7 +183,7 @@ static const int KOLISEO_API_VERSION_INT =
/**
* Defines current API version string.
*/
static const char KOLISEO_API_VERSION_STRING[] = "0.3.17"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/
static const char KOLISEO_API_VERSION_STRING[] = "0.3.18"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/

/**
* Returns current koliseo version as a string.
Expand Down Expand Up @@ -346,6 +346,7 @@ void *kls_push_zero_named(Koliseo * kls, ptrdiff_t size, ptrdiff_t align,
void *kls_push_zero_typed(Koliseo * kls, ptrdiff_t size, ptrdiff_t align,
ptrdiff_t count, int type, char *name, char *desc);
void *kls_pop(Koliseo * kls, ptrdiff_t size, ptrdiff_t align, ptrdiff_t count);
void kls_dbg_features(void);

/**
* Macro used to request memory from a Koliseo.
Expand Down

0 comments on commit 4c964af

Please sign in to comment.