Commit 2fe3f414 authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Add a first module

parent d119b85f
......@@ -67,8 +67,6 @@ export LD_LIBRARY_PATH="$SOURCE_TOP/root/lib:$LD_LIBRARY_PATH"
echo "Looking for libtarot.pc in $PKG_CONFIG_PATH"
./configure \
CFLAGS="-Wall -Wextra -g -O0" \
LDFLAGS="-L/usr/lib/x86_64-linux-gnu" \
DISTCHECK_CONFIGURE_FLAGS='LDFLAGS="-L/usr/lib/x86_64-linux-gnu"' \
--prefix="$SOURCE_TOP/public" \
|| (cat config.log ; exit 1) \
|| exit 1
......
......@@ -25,8 +25,6 @@ make -j 16 install || exit 1
make distclean || exit 1
export PKG_CONFIG_PATH="$PWD/root/share/pkgconfig:$PKG_CONFIG_PATH"
../tarot-$PROGRAM_VERSION/configure \
LDFLAGS="-L/usr/lib/x86_64-linux-gnu" \
DISTCHECK_CONFIGURE_FLAGS='LDFLAGS="-L/usr/lib/x86_64-linux-gnu"' \
--prefix="$PWD/../public" \
--enable-silent-rules=yes \
|| (cat config.log; exit 1)
......
......@@ -30,17 +30,17 @@ AS_IF([test "x$enable_valgrind" = "xyes"], [
])
])
AM_CONDITIONAL([HAVE_VALGRIND], [test "x$HAVE_VALGRIND" = "xyes"])
GUILE_PROGS
if test "x$GUILD" = "x"; then
AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.])
fi
# Checks for libraries.
gl_INIT
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19])
LIBOPTS_CHECK
PKG_CHECK_MODULES([GUILE], [guile-2.2],, [
PKG_CHECK_MODULES([GUILE], [guile-2.0],, [
AC_MSG_ERROR([Either guile-2.2 or guile-2.0 is required])
])
])
GUILE_PKG
# Checks for header files.
......
......@@ -2,4 +2,4 @@
src/program/options.c
src/program/main.c
src/parser/parser.y
\ No newline at end of file
src/scm/tarot.scm
\ No newline at end of file
......@@ -5,16 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2018-10-06 13:53+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
"Project-Id-Version: tarot 0.0.4-d030\n"
"Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
"POT-Creation-Date: 2018-10-06 12:48+0200\n"
"POT-Creation-Date: 2018-10-06 13:55+0200\n"
"PO-Revision-Date: 2018-10-03 23:52+0200\n"
"Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
"Language-Team: français <>\n"
......
......@@ -19,3 +19,4 @@
AM_CPPFLAGS += -I $(srcdir)/%reldir% -I %reldir%
include %reldir%/program/Makefile.am
include %reldir%/scm/Makefile.am
......@@ -196,24 +196,28 @@ set_sysconfdir ()
static void *
run_with_guile (void *unused)
{
exit_status = 0;
SCM e;
switch (mode)
{
case MODE_ASSISTANT:
scm_call (scm_c_public_lookup ("tarot program", "run-assistant"),
exit_status =
e = scm_call (scm_c_public_lookup ("tarot program", "run-assistant"),
scm_from_bool (brief),
scm_from_bool (explain), SCM_UNDEFINED);
break;
case MODE_EXPORT_FEATURES:
scm_call (scm_c_public_lookup ("tarot program", "run-export-features"),
e = scm_call (scm_c_public_lookup ("tarot program", "run-export-features"),
SCM_UNDEFINED);
break;
case MODE_GENERATE:
scm_call (scm_c_public_lookup ("tarot program", "run-generate"),
e = scm_call (scm_c_public_lookup ("tarot program", "run-generate"),
scm_from_int (n_players),
scm_from_bool (call),
scm_from_utf8_string (model),
scm_from_int (seed), SCM_UNDEFINED);
break;
}
exit_status = scm_to_int (e);
return unused;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment