diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-04-13 15:05:35 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-04-13 15:05:35 +0000 |
| commit | e115a31ee5645f0f26649646f78662eee4f0cab7 (patch) | |
| tree | 99413b3a6269d3d0e2515b2dc8260dbf36709b76 /rules | |
| parent | 4048830f70270a3df02e551d7d4bfb6c67b0d8e5 (diff) | |
| download | ptxdist-e115a31ee5645f0f26649646f78662eee4f0cab7.tar.gz ptxdist-e115a31ee5645f0f26649646f78662eee4f0cab7.tar.xz | |
some fltk updates; patch by Steven Scholz
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2443 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/fltk.in | 26 | ||||
| -rw-r--r-- | rules/fltk.make | 27 |
2 files changed, 50 insertions, 3 deletions
diff --git a/rules/fltk.in b/rules/fltk.in index 8bd6dbdce..94fde234c 100644 --- a/rules/fltk.in +++ b/rules/fltk.in @@ -4,4 +4,30 @@ config FLTK bool prompt "FLTK-GUI Toolkit" depends on XFREE430 + +config FLTK_OPENGL + bool + prompt "Turn on OpenGL support" + default y + depends on FLTK + +config FLTK_THREADS + bool + prompt "Enable multi-threading support" + default n + depends on FLTK + +config FLTK_XFT + bool + prompt "Turn on Xft support" + default n + depends on FLTK + +config FLTK_XDBE + bool + prompt "Turn on Xdbe support" + default n + depends on FLTK + + endmenu diff --git a/rules/fltk.make b/rules/fltk.make index 3586b1875..bb47d14e5 100644 --- a/rules/fltk.make +++ b/rules/fltk.make @@ -19,7 +19,7 @@ endif # # Paths and names # -FLTK_VERSION = 1.1.4 +FLTK_VERSION = 1.1.6 FLTK = fltk-$(FLTK_VERSION) FLTK_SUFFIX = source.tar.gz FLTK_URL = ftp://ftp.easysw.com/pub/fltk/$(FLTK_VERSION)/$(FLTK)-$(FLTK_SUFFIX) @@ -78,10 +78,31 @@ FLTK_ENV = $(CROSS_ENV) # FLTK_AUTOCONF = $(CROSS_AUTOCONF) FLTK_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -FLTK_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/X11 +FLTK_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include FLTK_AUTOCONF += --x-libraries=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib FLTK_AUTOCONF += --enable-shared -#FLTK_AUTOCONF += --enable-threads + +ifdef PTXCONF_FLTK_THREADS +FLTK_AUTOCONF += --enable-threads +endif + +ifdef PTXCONF_FLTK_OPENGL +FLTK_AUTOCONF += --enable-gl +else +FLTK_AUTOCONF += --disable-gl +endif + +FLTK_AUTOCONF += --enable-localjpeg +FLTK_AUTOCONF += --enable-localzlib +FLTK_AUTOCONF += --enable-localpng + +ifdef PTXCONF_FLTK_XFT +FLTK_AUTOCONF += --enable-xft +endif + +ifdef PTXCONF_FLTK_XDBE +FLTK_AUTOCONF += --enable-xdbe +endif $(STATEDIR)/fltk.prepare: $(fltk_prepare_deps) @$(call targetinfo, $@) |