From cbeff23cbd5cd5e2680f842e80805a4e9b5a1d42 Mon Sep 17 00:00:00 2001 From: ashmew2 Date: Fri, 11 Apr 2014 21:26:21 +0000 Subject: [PATCH] libnsfb builds. Enables keyboard/mouse in Netsurf git-svn-id: svn://kolibrios.org@4823 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/network/netsurf/build-libs/libnsfb.a | Bin 8 -> 42738 bytes contrib/network/netsurf/libnsfb/Makefile | 98 ++---------------- .../netsurf/libnsfb/src/surface/Makefile | 4 +- 3 files changed, 9 insertions(+), 93 deletions(-) diff --git a/contrib/network/netsurf/build-libs/libnsfb.a b/contrib/network/netsurf/build-libs/libnsfb.a index 8b277f0dd5dcdcb9c4b6c0b7a32153664f111266..672fe311bd26e51694c324f6739d7b77f56db38d 100644 GIT binary patch literal 42738 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 O+6T_gt7&mA>3;)f#ta<* literal 8 PcmY$iNi0gvu;T&%3Vs4a diff --git a/contrib/network/netsurf/libnsfb/Makefile b/contrib/network/netsurf/libnsfb/Makefile index ef89e09e58..89ad70c38c 100644 --- a/contrib/network/netsurf/libnsfb/Makefile +++ b/contrib/network/netsurf/libnsfb/Makefile @@ -1,94 +1,10 @@ -# Component settings -COMPONENT := nsfb -COMPONENT_VERSION := 0.0.2 -# Default to a static library -COMPONENT_TYPE ?= lib-static +# This is the makefile in kolibrios/contrib/network/netsurf/libcss +# Need to add recursive calling to all the subdirectories. For now, use the generated .a file for testing. -# Setup the tooling -#PREFIX ?= /opt/netsurf -PREFIX ?= /usr -NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem -include $(NSSHARED)/makefiles/Makefile.tools +OUTFILE := $(CURDIR)/libnsfb.a -# Reevaluate when used, as BUILDDIR won't be defined yet -TESTRUNNER = test/runtest.sh $(BUILDDIR) $(EXEEXT) +OBJS = $(wildcard src/libo.o) +OBJS := $(OBJS) $(wildcard src/plot/libo.o) +OBJS := $(OBJS) $(wildcard src/surface/libo.o) -# Toolchain flags -WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \ - -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs -Werror -pedantic \ - -Wno-overlength-strings # For nsglobe.c -CFLAGS := -g -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112L \ - -I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) - -NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom - -$(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))) - -ifeq ($(NSFB_SDL_AVAILABLE),yes) - $(eval $(call pkg_config_package_add_flags,sdl,CFLAGS)) - $(eval $(call pkg_config_package_add_flags,sdl,TESTCFLAGS,TESTLDFLAGS)) - - REQUIRED_PKGS := $(REQUIRED_PKGS) sdl -endif - -ifeq ($(NSFB_XCB_AVAILABLE),yes) - # Size hint allocators were removed in xcb-icccm 0.3.0 - $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_SIZE_HINTS,xcb-icccm,0.3.0)) - ifeq ($(NSFB_XCB_ICCCM_SIZE_HINTS),yes) - CFLAGS := $(CFLAGS) -DNSFB_NEED_HINTS_ALLOC - endif - - # xcb-icccm 0.3.8 introduced an additional "icccm_" in function names - $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_API_PREFIX,xcb-icccm,0.3.8)) - ifeq ($(NSFB_XCB_ICCCM_API_PREFIX),yes) - CFLAGS := $(CFLAGS) -DNSFB_NEED_ICCCM_API_PREFIX - endif - - # xcbproto 1.6 incorporated atoms previously found in xcb_atom - # However, libxcb <1.3 did not report xcbproto versions. Assume xcbproto 1.5 in this case. - $(eval $(call pkg_config_package_min_version,NSFB_HAVE_MODERN_XCB,xcb,1.3)) - ifeq ($(NSFB_HAVE_MODERN_XCB),yes) - $(eval $(call pkg_config_get_variable,NSFB_XCBPROTO_VERSION,xcb,xcbproto_version)) - NSFB_XCBPROTO_MAJOR_VERSION := $(word 1,$(subst ., ,$(NSFB_XCBPROTO_VERSION))) - NSFB_XCBPROTO_MINOR_VERSION := $(word 2,$(subst ., ,$(NSFB_XCBPROTO_VERSION))) - CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=$(NSFB_XCBPROTO_MAJOR_VERSION) - CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=$(NSFB_XCBPROTO_MINOR_VERSION) - else - CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=1 - CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=5 - endif - - $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),CFLAGS)) - $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),TESTCFLAGS,TESTLDFLAGS)) - - REQUIRED_PKGS := $(REQUIRED_PKGS) $(NSFB_XCB_PKG_NAMES) - - $(eval $(call pkg_config_package_available,NSFB_XCB_UTIL_AVAILABLE,xcb-util)) - ifeq ($(NSFB_XCB_UTIL_AVAILABLE),yes) - REQUIRED_PKGS := $(REQUIRED_PKGS) xcb-util - endif -endif - -ifeq ($(NSFB_VNC_AVAILABLE),yes) - $(eval $(call pkg_config_package_add_flags,libvncserver,CFLAGS)) - $(eval $(call pkg_config_package_add_flags,libvncserver,TESTCFLAGS,TESTLDFLAGS)) - - REQUIRED_PKGS := $(REQUIRED_PKGS) libvncserver -endif - -TESTLDFLAGS := -lm -Wl,--whole-archive -l$(COMPONENT) -Wl,--no-whole-archive $(TESTLDFLAGS) - -include $(NSBUILD)/Makefile.top - -# Extra installation rules -I := /include -INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb.h -INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_plot.h -INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_plot_util.h -INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_event.h -INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_cursor.h -INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in -INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT) +include $(MENUETDEV)/makefiles/Makefile_for_lib diff --git a/contrib/network/netsurf/libnsfb/src/surface/Makefile b/contrib/network/netsurf/libnsfb/src/surface/Makefile index 3179b97ce8..b565bd9811 100644 --- a/contrib/network/netsurf/libnsfb/src/surface/Makefile +++ b/contrib/network/netsurf/libnsfb/src/surface/Makefile @@ -1,7 +1,7 @@ # Sources -OBJS := surface.o able.o ram.o linux.o sdl.o kolibri.o +OBJS := surface.o able.o ram.o linux.o kolibri.o -OUTFILE = sup.o +OUTFILE = libo.o CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include include $(MENUETDEV)/makefiles/Makefile_for_o_lib