diff --git a/build/lol-build b/build/lol-build index f08c162b..b54276b2 100755 --- a/build/lol-build +++ b/build/lol-build @@ -152,7 +152,7 @@ configure() GTK_LIBS="$GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0" GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0" - CPPFLAGS="$CPPFLAGS -L$PWD/contrib/libcaca-0.99.beta18/include -DCACA_STATIC" + CPPFLAGS="$CPPFLAGS -I$PWD/contrib/libcaca-0.99.beta18/include -DCACA_STATIC" PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" ./configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS" ;; diff --git a/tools/make-font.cpp b/tools/make-font.cpp index bd0760f4..f5d35708 100644 --- a/tools/make-font.cpp +++ b/tools/make-font.cpp @@ -12,6 +12,32 @@ #include +/* FIXME: ugly MinGW hack */ +#if defined _WIN32 && defined __GNUC__ +extern "C" +{ +int sprintf_s(char *s, size_t n, const char *fmt, ...) +{ + va_list args; + int ret; + va_start(args, fmt); + ret = vsnprintf(s, n, fmt, args); + va_end(args); + return ret; +} + +int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list args) +{ + return vsnprintf(s, n, fmt, args); +} + +int _time32(__time32_t *timer) +{ + return 0; +} +} +#endif + int main(void) { caca_canvas_t *cv = caca_create_canvas(16, 16);