diff options
author | Adrian Lees <adrian@aemulor.com> | 2005-04-15 05:52:31 +0000 |
---|---|---|
committer | Adrian Lees <adrian@aemulor.com> | 2005-04-15 05:52:31 +0000 |
commit | edfcfad31d9626faaa7d5f212435e27a31dcad7a (patch) | |
tree | 688e2c011a2e554a0a76a0e2e055a95bf48b1586 | |
parent | 28e757a362c4643c615f93fed9e6d07bcff8f089 (diff) | |
download | netsurf-edfcfad31d9626faaa7d5f212435e27a31dcad7a.tar.gz netsurf-edfcfad31d9626faaa7d5f212435e27a31dcad7a.tar.bz2 |
[project @ 2005-04-15 05:52:31 by adrianl]
New files for text selection
svn path=/import/netsurf/; revision=1639
-rw-r--r-- | makefile | 10 | ||||
-rw-r--r-- | riscos.mk | 3 |
2 files changed, 11 insertions, 2 deletions
@@ -22,7 +22,8 @@ OBJECTS_COMMON += css.o css_enum.o parser.o ruleset.o scanner.o # css/ OBJECTS_COMMON += box.o box_construct.o box_normalise.o form.o html.o \ html_redraw.o layout.o list.o textplain.o # render/ OBJECTS_COMMON += messages.o pool.o talloc.o url.o utils.o # utils/ -OBJECTS_COMMON += imagemap.o loginlist.o options.o tree.o # desktop/ +OBJECTS_COMMON += imagemap.o loginlist.o options.o \ + selection.o tree.o # desktop/ OBJECTS_IMAGE = jpeg.o mng.o gif.o gifread.o # image/ @@ -105,6 +106,8 @@ CFLAGS_GTK = -std=c9x -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ $(WARNFLAGS) -I.. -g \ `pkg-config --cflags gtk+-2.0` `xml2-config --cflags` +AFLAGS_RISCOS = -CPU XScale -ThrowBack -Quit + # targets riscos: $(RUNIMAGE) $(RUNIMAGE) : $(OBJS_RISCOS) @@ -147,6 +150,11 @@ $(OBJDIR_GTK)/%.o : %.c @echo "==> $<" @gcc -o $@ -c $(CFLAGS_GTK) $< +# pattern rules for asm source +$(OBJDIR_RISCOS)/%.o : %.s + @echo "== $<" + $(ASM) -o $@ $(AFLAGS_RISCOS) $< + # special cases css/css_enum.c css/css_enum.h: css/css_enums css/makeenum cd ..; perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums @@ -1,12 +1,13 @@ CC = gcc CC_DEBUG = gcc +ASM = objasm PLATFORM_CFLAGS_RISCOS = -mthrowback -INSLibs:include -IOSLib: PLATFORM_CFLAGS_DEBUG = -mthrowback -INSLibs:include -IOSLib: LDFLAGS_RISCOS = NSLibs:lib/libxml2 NSLibs:lib/libz NSLibs:lib/libcurl \ NSLibs:lib/libssl NSLibs:lib/libcrypto NSLibs:lib/libcares \ - NSLibs:lib/libmng NSLibs:lib/libjpeg OSLib:o.oslib32 + NSLibs:lib/libmng NSLibs:lib/libjpeg NSLibs:lib/librufl OSLib:o.oslib32 LDFLAGS_SMALL = NSLibs:lib/libxml2 NSLibs:lib/libz NSLibs:lib/libcurl \ NSLibs:lib/libares NSLibs:lib/libmng \ NSLibs:lib/libjpeg OSLib:o.oslib32 |