summaryrefslogtreecommitdiff
path: root/package/fltk/Makefile
diff options
context:
space:
mode:
authorwbx <wbx@openadk.org>2011-04-08 12:37:48 +0200
committerwbx <wbx@openadk.org>2011-04-08 12:37:48 +0200
commit34fc06736330cc993fd1c936ed9205cdc73aa0fd (patch)
tree42319fe9aa25f82370948335d6dccd571da945d6 /package/fltk/Makefile
parent6ea415c59b9ced9d08be7348d268ae4543017a56 (diff)
parent297e4004d154572e29ee71f8ed852b022686e852 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/fltk/Makefile')
-rw-r--r--package/fltk/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index bc0607942..59c6cdcff 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= 557544badbacca4ee1ebb2448f6e1f8a
PKG_DESCR:= fast light toolkit
PKG_SECTION:= libs
-PKG_BUILDDEP:= libX11 libXi MesaLib freeglut
+PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype
PKG_URL:= http://www.fltk.org/
PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
PKG_NEED_CXX:= 1
@@ -27,16 +27,18 @@ $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
-LIBRARIES+=-lssp
+LIBRARIES+=-lssp -lssp_nonshared
endif
+CONFIGURE_ARGS+= --disable-xinerama
+
ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
+CONFIGURE_ENV+= CXXFLAGS="${TARGET_CXXFLAGS} -fno-threadsafe-statics -fno-builtin -nostdinc++ \
-I${STAGING_TARGET_DIR}/usr/include/uClibc++" \
LIBS="$(LIBRARIES)"
endif
-post-install:
+libfltk-install:
$(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib
$(CP) ${WRKINST}/usr/lib/libfltk*.so* $(IDIR_LIBFLTK)/usr/lib