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

* Compile and link in svgManager.[ch] (its complaining about linker errors otherwise) 

* Detect libsvg-cairo in the configure script
 * Link against libsvg-cairo


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6440 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-12-07 03:03:50 +00:00
parent d261ddbbd1
commit 7e18d7e5aa
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/betawidget/configure.ac
View File

@ -90,6 +90,7 @@ PKG_CHECK_MODULES([SDL], [sdl >= 1.2])
AC_SUBST([PLATFORM_REQUIRES], [sdl])
PKG_CHECK_MODULES([CAIRO], [cairo])
PKG_CHECK_MODULES([SVG_CAIRO], [libsvg-cairo])
# First check the pkg-config lua5.1 package
PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1], [

6
lib/betawidget/src/Makefile.am
View File

@ -25,14 +25,15 @@ libbetawidget_la_SOURCES = \
geom.c \
hBox.c \
spacer.c \
svgManager.c \
table.c \
textEntry.c \
vector.c \
widget.c \
window.c
libbetawidget_la_CPPFLAGS = $(CAIRO_CFLAGS) $(LUA_CFLAGS) -DLIB_COMPILE=1
libbetawidget_la_LDFLAGS = $(LUA_LIBS) $(CAIRO_LIBS) $(OPENGL_LIBS) -version-info $(LIBTOOL_VERSION)
libbetawidget_la_CPPFLAGS = $(SVG_CAIRO_CFLAGS) $(CAIRO_CFLAGS) $(LUA_CFLAGS) -DLIB_COMPILE=1
libbetawidget_la_LDFLAGS = $(SVG_CAIRO_LIBS) $(LUA_LIBS) $(CAIRO_LIBS) $(OPENGL_LIBS) -version-info $(LIBTOOL_VERSION)
libbetawidget_la_LIBADD = platform/libplatform.la libutil.la
# FIXME: As much non-API headers (i.e. headers that shouldn't be directly
@ -46,6 +47,7 @@ pkginclude_HEADERS = \
geom.h \
hBox.h \
spacer.h \
svgManager.h \
table.h \
textEntry.h \
vector.h \