From 1aa36eb18c490095e3bc6d3ee271f697055402e7 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Mon, 25 Apr 2011 20:29:47 +0100 Subject: Add libs target, and webos OS settings. Add libs (to allow for building of libraries without apps, such as will be required for the WebOS bindings). Add 2 webos OS setups to the Makerules file to match the 2 default webos configurations used in the PDK. --- Makefile | 3 +++ Makerules | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Makefile b/Makefile index 6871dbe9..0e61a9eb 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,9 @@ $(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) $(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.o)) $(MUXPS_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o)) +libs: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS) + @ echo MuPDF/XPS and underlying libraries built + # --- Generated CMAP and FONT files --- CMAPDUMP := $(OUT)/cmapdump diff --git a/Makerules b/Makerules index 811c35c7..63a75d6a 100644 --- a/Makerules +++ b/Makerules @@ -64,3 +64,21 @@ CFLAGS += -O3 -mfpu=neon -mcpu=cortex-a8 -mfloat-abi=softfp -ftree-vectorize -ff CROSSCOMPILE=yes NOX11=yes endif + +ifeq "$(OS)" "webos-pre-cross" +CC = arm-none-linux-gnueabi-gcc +LD = arm-none-linux-gnueabi-gcc +AR = arm-none-linux-gnueabi-ar +CFLAGS += -O3 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize -ffast-math -fsingle-precision-constant +CROSSCOMPILE=yes +NOX11=yes +endif + +ifeq "$(OS)" "webos-pixi-cross" +CC = arm-none-linux-gnueabi-gcc +LD = arm-none-linux-gnueabi-gcc +AR = arm-none-linux-gnueabi-ar +CFLAGS += -O3 -mcpu=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp -ffast-math -fsingle-precision-constant +CROSSCOMPILE=yes +NOX11=yes +endif -- cgit v1.2.3