Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/eed97fe87c72b4dfd03db4863a037f255b808156
...commit
http://git.netsurf-browser.org/netsurf.git/commit/eed97fe87c72b4dfd03db4863a037f255b808156
...tree
http://git.netsurf-browser.org/netsurf.git/tree/eed97fe87c72b4dfd03db4863a037f255b808156
The branch, ashmew2/netsurf-kolibrios has been updated
via eed97fe87c72b4dfd03db4863a037f255b808156 (commit)
from 38cbbbef95702f769df8d1109b06d1793c33153a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=eed97fe87c72b4dfd03db4863a037f255b808156
commit eed97fe87c72b4dfd03db4863a037f255b808156
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Enable GIF PNG JPEG image formats
diff --git a/Makefile b/Makefile
index 0fd338a..eef8ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -540,7 +540,7 @@ ifneq ($(TARGET),kolibrios)
else
KOL_LIBC := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/
KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
- LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16
+ LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16 -ljpeg
OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0 -Map
netsurf-kolibrios.map
NS_INCLUDE := $(PREFIX)/include
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index fc065d1..742011b 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -11,6 +11,8 @@ CFLAGS +=
'-DKOLIBRI_RUNTIME_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
# Enable PNG and others from here (no pkg config for now)
CFLAGS += '-DWITH_PNG'
+CFLAGS += '-DWITH_GIF'
+CFLAGS += '-DWITH_JPEG'
# compile time font locations
CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
diff --git a/frontends/kolibrios/Makefile.defaults
b/frontends/kolibrios/Makefile.defaults
index ef51b6c..5441fd0 100644
--- a/frontends/kolibrios/Makefile.defaults
+++ b/frontends/kolibrios/Makefile.defaults
@@ -42,3 +42,9 @@ NETSURF_KOLIBRI_RESPATH := /usbhd0/1/res
# KolibriOS does not need curl. It has it's own HTTP library.
NETSURF_USE_CURL := NO
NETSURF_USE_KOLIBRI_HTTPLIB := YES
+
+# image formats
+NETSURF_USE_PNG := YES
+NETSURF_USE_GIF := YES
+NETSURF_USE_JPEG := YES
+NETSURF_USE_BMP := NO
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
frontends/kolibrios/Makefile | 2 ++
frontends/kolibrios/Makefile.defaults | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 0fd338a..eef8ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -540,7 +540,7 @@ ifneq ($(TARGET),kolibrios)
else
KOL_LIBC := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/
KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
- LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16
+ LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16 -ljpeg
OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0 -Map
netsurf-kolibrios.map
NS_INCLUDE := $(PREFIX)/include
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index fc065d1..742011b 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -11,6 +11,8 @@ CFLAGS +=
'-DKOLIBRI_RUNTIME_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
# Enable PNG and others from here (no pkg config for now)
CFLAGS += '-DWITH_PNG'
+CFLAGS += '-DWITH_GIF'
+CFLAGS += '-DWITH_JPEG'
# compile time font locations
CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
diff --git a/frontends/kolibrios/Makefile.defaults
b/frontends/kolibrios/Makefile.defaults
index ef51b6c..5441fd0 100644
--- a/frontends/kolibrios/Makefile.defaults
+++ b/frontends/kolibrios/Makefile.defaults
@@ -42,3 +42,9 @@ NETSURF_KOLIBRI_RESPATH := /usbhd0/1/res
# KolibriOS does not need curl. It has it's own HTTP library.
NETSURF_USE_CURL := NO
NETSURF_USE_KOLIBRI_HTTPLIB := YES
+
+# image formats
+NETSURF_USE_PNG := YES
+NETSURF_USE_GIF := YES
+NETSURF_USE_JPEG := YES
+NETSURF_USE_BMP := NO
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
