hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added --enable-mod-x11 and --enable-mod-ffi to configure

Browse Source
This commit is contained in:
hyunghwan.chung
2017-04-28 04:03:52 +00:00
parent 9ee7d9e110
commit bce77eda6c
10 changed files with 199 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
moo/lib/Makefile.am
View File

@ -68,12 +68,20 @@ libmoo_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libmoo_la_LIBADD = $(LIBADD_LIB_COMMON)
if ENABLE_STATIC_MODULE
libmoo_la_LIBADD += -lmoo-ffi -lmoo-console -lmoo-stdio -lmoo-x11
libmoo_la_LIBADD += -lmoo-console -lmoo-stdio
libmoo_la_DEPENDENCIES = \
$(abs_builddir)/../mod/libmoo-ffi.la \
$(abs_builddir)/../mod/libmoo-console.la \
$(abs_builddir)/../mod/libmoo-stdio.la \
$(abs_builddir)/../mod/libmoo-x11.la
$(abs_builddir)/../mod/libmoo-stdio.la
if ENABLE_MOD_FFI
libmoo_la_LIBADD += -lmoo-ffi
libmoo_la_DEPENDENCIES += $(abs_builddir)/../mod/libmoo-ffi.la
endif
if ENABLE_MOD_X11
libmoo_la_LIBADD += -lmoo-x11
libmoo_la_DEPENDENCIES += $(abs_builddir)/../mod/libmoo-x11.la
endif
endif
bin_PROGRAMS = moo

18
moo/lib/Makefile.in
View File

@ -95,10 +95,16 @@ host_triplet = @host@
# to the first number in -version-info above
@WIN32_TRUE@am__append_3 = -DMOO_DEFAULT_MODPREFIX=\"libmoo-\" -DMOO_DEFAULT_MODPOSTFIX=\"-1\"
@WIN32_FALSE@am__append_4 = -DMOO_DEFAULT_MODPREFIX=\"$(libdir)/libmoo-\" -DMOO_DEFAULT_MODPOSTFIX=\"\"
@ENABLE_STATIC_MODULE_TRUE@am__append_5 = -lmoo-ffi -lmoo-console -lmoo-stdio -lmoo-x11
@ENABLE_STATIC_MODULE_TRUE@am__append_5 = -lmoo-console -lmoo-stdio
@ENABLE_STATIC_MODULE_FALSE@libmoo_la_DEPENDENCIES = \
@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_3) \
@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_1) \
@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_1) \
@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_1)
@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_6 = -lmoo-ffi
@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_7 = $(abs_builddir)/../mod/libmoo-ffi.la
@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_8 = -lmoo-x11
@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_9 = $(abs_builddir)/../mod/libmoo-x11.la
bin_PROGRAMS = moo$(EXEEXT)
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -444,13 +450,11 @@ libmoo_la_SOURCES = \
libmoo_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
libmoo_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libmoo_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_5)
@ENABLE_STATIC_MODULE_TRUE@libmoo_la_DEPENDENCIES = \
@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-ffi.la \
@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-console.la \
libmoo_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_5) \
$(am__append_6) $(am__append_8)
@ENABLE_STATIC_MODULE_TRUE@libmoo_la_DEPENDENCIES = $(abs_builddir)/../mod/libmoo-console.la \
@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-stdio.la \
@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-x11.la
@ENABLE_STATIC_MODULE_TRUE@ $(am__append_7) $(am__append_9)
moo_SOURCES = main.c
moo_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
moo_LDFLAGS = $(LDFLAGS_LIB_COMMON)

7
moo/lib/exec.c
View File

@ -3111,7 +3111,6 @@ static MOO_INLINE int _store_raw_int (moo_t* moo, moo_uint8_t* rawptr, moo_oow_t
/* assume 2's complement */
max = (moo_ooi_t)(~(moo_oow_t)0 >> ((MOO_SIZEOF_OOW_T - size) * 8 + 1));
min = -max - 1;
MOO_DEBUG2 (moo, "MAX = %zd MIN = %zd\n", max, min);
if (w > max || w < min)
{
@ -3156,21 +3155,19 @@ static MOO_INLINE int _store_raw_uint (moo_t* moo, moo_uint8_t* rawptr, moo_oow_
moo_oow_t w, max;
if ((n = moo_inttooow (moo, voop, &w)) <= -1)
if ((n = moo_inttooow (moo, voop, &w)) <= 0)
{
if (n <= -1) moo->errnum = MOO_ERANGE;
if (n <= -1) moo->errnum = MOO_ERANGE; /* negative number */
return -1;
}
max = (~(moo_oow_t)0 >> ((MOO_SIZEOF_OOW_T - size) * 8));
MOO_DEBUG2 (moo, "MAX = %zx %zx\n", max, max);
if (w > max)
{
moo->errnum = MOO_ERANGE;
return -1;
}
switch (size)
{
case 1:

9
moo/lib/moo-cfg.h.in
View File

@ -277,6 +277,9 @@
/* This value is set to 1 to indicate that the system argz facility works */
#undef HAVE_WORKING_ARGZ
/* Define to 1 if you have the <xcb/xcb.h> header file. */
#undef HAVE_XCB_XCB_H
/* Define to 1 if you have the `_vsnprintf' function. */
#undef HAVE__VSNPRINTF
@ -332,6 +335,12 @@
/* use libltdl when loading a dynamic module */
#undef MOO_ENABLE_LIBLTDL
/* build mod/ffi */
#undef MOO_ENABLE_MOD_FFI
/* build mod/x11 */
#undef MOO_ENABLE_MOD_X11
/* link modules statically into the main library */
#undef MOO_ENABLE_STATIC_MODULE

6
moo/lib/moo.c
View File

@ -372,10 +372,14 @@ static struct
static_modtab[] =
{
{ "console", moo_mod_console },
#if defined(MOO_ENABLE_MOD_FFI)
{ "ffi", moo_mod_ffi },
#endif
{ "stdio", moo_mod_stdio },
#if defined(MOO_ENABLE_MOD_X11)
{ "x11", moo_mod_x11 },
{ "x11.win", moo_mod_x11_win }
{ "x11.win", moo_mod_x11_win },
#endif
};
#endif