Gitweb links:
...log
http://git.netsurf-browser.org/libnsfb.git/shortlog/18c18d139e7ba8251d6b6c3d62ef1407ff3fc4ad
...commit
http://git.netsurf-browser.org/libnsfb.git/commit/18c18d139e7ba8251d6b6c3d62ef1407ff3fc4ad
...tree
http://git.netsurf-browser.org/libnsfb.git/tree/18c18d139e7ba8251d6b6c3d62ef1407ff3fc4ad
The branch, ashmew2/kolibri has been updated
via 18c18d139e7ba8251d6b6c3d62ef1407ff3fc4ad (commit)
from c1b4b277053a8c45640a96158580ef0d8130db3d (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/libnsfb.git/commit/?id=18c18d139e7ba8251d6b6c3d62ef1407ff3fc4ad
commit 18c18d139e7ba8251d6b6c3d62ef1407ff3fc4ad
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Makefile: Add support for building surfaces for kolibrios
Fix CFLAGS for KolibriOS frontend in order to ignore warnings.
Enable RAM and Kolibri surfaces when building for Kolibri.
Do all of this without breaking support for existing frontends.
diff --git a/Makefile b/Makefile
index bea4fa3..b4eaee6 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
# Component settings
COMPONENT := nsfb
-COMPONENT_VERSION := 0.1.4
+COMPONENT_VERSION := 0.1.3
# Default to a static library
COMPONENT_TYPE ?= lib-static
@@ -26,6 +26,11 @@ WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith
-Wcast-align \
ifneq ($(VARIANT),release)
WARNFLAGS:= $(WARNFLAGS) -Werror
endif
+
+ifeq ($(HOST),kolibrios)
+ WARNFLAGS := $(WARNFLAGS) -Wno-error
+endif
+
# would like these flags but gcc earlier than 4.4 fail
#-pedantic -Wno-overlength-strings # For nsglobe.c
@@ -43,17 +48,27 @@ endif
NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
# determine which surface handlers can be compiled based upon avalable library
-$(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
-$(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl))
-$(eval $(call
pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
-$(eval $(call pkg_config_package_available,NSFB_WLD_AVAILABLE,wayland-client))
-
-# surfaces not detectable via pkg-config
-NSFB_ABLE_AVAILABLE := no
-ifeq ($(findstring linux,$(HOST)),linux)
- NSFB_LINUX_AVAILABLE := yes
+
+ifneq ($(HOST),kolibrios)
+ $(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl))
+ $(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
+ $(eval $(call
pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
+ $(eval $(call
pkg_config_package_available,NSFB_WLD_AVAILABLE,wayland-client))
+ # surfaces not detectable via pkg-config
+ NSFB_ABLE_AVAILABLE := no
+ ifeq ($(findstring linux,$(HOST)),linux)
+ NSFB_LINUX_AVAILABLE := yes
+ else
+ NSFB_LINUX_AVAILABLE := no
+ endif
else
- NSFB_LINUX_AVAILABLE := no
+ NSFB_SDL_AVAILABLE := no
+ NSFB_ABLE_AVAILABLE := no
+ NSFB_RAM_AVAILABLE := yes
+ NSFB_KOLIBRI_AVAILABLE := yes
+ NSFB_VNC_AVAILABLE := no
+ NSFB_XCB_AVAILABLE := no
+ NSFB_WLD_AVAILABLE := no
endif
# Flags and setup for each support library
-----------------------------------------------------------------------
Summary of changes:
Makefile | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index bea4fa3..b4eaee6 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
# Component settings
COMPONENT := nsfb
-COMPONENT_VERSION := 0.1.4
+COMPONENT_VERSION := 0.1.3
# Default to a static library
COMPONENT_TYPE ?= lib-static
@@ -26,6 +26,11 @@ WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith
-Wcast-align \
ifneq ($(VARIANT),release)
WARNFLAGS:= $(WARNFLAGS) -Werror
endif
+
+ifeq ($(HOST),kolibrios)
+ WARNFLAGS := $(WARNFLAGS) -Wno-error
+endif
+
# would like these flags but gcc earlier than 4.4 fail
#-pedantic -Wno-overlength-strings # For nsglobe.c
@@ -43,17 +48,27 @@ endif
NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
# determine which surface handlers can be compiled based upon avalable library
-$(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
-$(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl))
-$(eval $(call
pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
-$(eval $(call pkg_config_package_available,NSFB_WLD_AVAILABLE,wayland-client))
-
-# surfaces not detectable via pkg-config
-NSFB_ABLE_AVAILABLE := no
-ifeq ($(findstring linux,$(HOST)),linux)
- NSFB_LINUX_AVAILABLE := yes
+
+ifneq ($(HOST),kolibrios)
+ $(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl))
+ $(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
+ $(eval $(call
pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
+ $(eval $(call
pkg_config_package_available,NSFB_WLD_AVAILABLE,wayland-client))
+ # surfaces not detectable via pkg-config
+ NSFB_ABLE_AVAILABLE := no
+ ifeq ($(findstring linux,$(HOST)),linux)
+ NSFB_LINUX_AVAILABLE := yes
+ else
+ NSFB_LINUX_AVAILABLE := no
+ endif
else
- NSFB_LINUX_AVAILABLE := no
+ NSFB_SDL_AVAILABLE := no
+ NSFB_ABLE_AVAILABLE := no
+ NSFB_RAM_AVAILABLE := yes
+ NSFB_KOLIBRI_AVAILABLE := yes
+ NSFB_VNC_AVAILABLE := no
+ NSFB_XCB_AVAILABLE := no
+ NSFB_WLD_AVAILABLE := no
endif
# Flags and setup for each support library
--
NetSurf Framebuffer library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
