Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Betawidget: 

* Use plain "cairo" instead of "cairo-svg" because "cairo-svg" is an ''output'' backend in which we're not interested
 * When re-running aclocal make sure to pass `-I m4` to it
 * For lack of -Werror lets compile with -Werror-implicit-function-declaration to die at implicit function declarations (rather than getting stranger errors)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6368 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-11-23 17:57:23 +00:00
parent fc808a8c89
commit d719e9977b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/betawidget/Makefile.am
View File

@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = platform
%_wrap_lua.cpp: %.i
@ -21,8 +23,8 @@ libbetawidget_la_SOURCES = \
widget.c \
window.c
libbetawidget_la_CPPFLAGS = $(CAIRO_SVG_CFLAGS) $(LUA_CFLAGS) -DLIB_COMPILE=1
libbetawidget_la_LDFLAGS = $(CAIRO_SVG_LIBS) $(OPENGL_LIBS)
libbetawidget_la_CPPFLAGS = $(CAIRO_CFLAGS) $(LUA_CFLAGS) -DLIB_COMPILE=1
libbetawidget_la_LDFLAGS = $(CAIRO_LIBS) $(OPENGL_LIBS)
libbetawidget_la_LIBADD = $(LUA_LIBTOOL) platform/libplatform.la libutil.la
# FIXME: As much non-API headers (i.e. headers that shouldn't be directly

5
lib/betawidget/configure.ac
View File

@ -70,7 +70,7 @@ AC_CHECK_FUNCS([memmove strdup])
# Checks for libraries.
PKG_CHECK_MODULES([SDL], [sdl >= 1.2])
PKG_CHECK_MODULES([CAIRO_SVG], [cairo-svg])
PKG_CHECK_MODULES([CAIRO], [cairo])
# First check the pkg-config lua5.1 package
PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1], [
AC_SUBST([LUA_LIBTOOL], [`${PKG_CONFIG} lua5.1 --variable=libtool_lib`])], [
@ -94,6 +94,9 @@ AC_CHECK_LIB(GLU, main,
AC_MSG_ERROR([GLU library not found.])))
AC_SUBST([OPENGL_LIBS], [${OPENGL_LIBS}])
CFLAGS="${CFLAGS} -Werror-implicit-function-declaration"
AC_SUBST([CFLAGS])
AC_CONFIG_FILES([Makefile
platform/Makefile
platform/sdl/Makefile])