From aacd53515bdeac86d90eabf352bc530ee89d644f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 26 Jan 2006 23:49:48 +0000 Subject: [PATCH] [project @ 2006-01-26 23:49:48 by tlsa] Revert accidentally checked in files.netsurf/riscos/window.c svn path=/import/netsurf/; revision=2047 --- !NetSurf/!Run,feb | 4 ++-- makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb index d312fcb21..7cd0cb153 100644 --- a/!NetSurf/!Run,feb +++ b/!NetSurf/!Run,feb @@ -1,4 +1,4 @@ -| Run file for NetSurf. ( $Revision: 1.46 $ ) +| Run file for NetSurf. ( $Revision: 1.47 $ ) | | This file ensures that the system resources required by NetSurf are | present. Additionally, it forces setting of system variables related @@ -84,5 +84,5 @@ Unset Alias$NetSurfRMLoad CDir .WWW CDir .WWW.NetSurf -WimpSlot -min 3100k -max 3100k +WimpSlot -min 2240k -max 2240k Run .!RunImage %*0 2>.WWW.NetSurf.Log \ No newline at end of file diff --git a/makefile b/makefile index 32ffedc19..c5a6fc75e 100644 --- a/makefile +++ b/makefile @@ -35,7 +35,7 @@ OBJECTS_RISCOS += 401login.o artworks.o assert.o awrender.o bitmap.o \ buffer.o configure.o debugwin.o \ dialog.o download.o draw.o filename.o filetype.o font.o \ global_history.o gui.o help.o history.o hotlist.o image.o \ - menus.o message.o plotters.o plugin.o print.o \ + menus.o message.o mouseactions.o plotters.o plugin.o print.o \ query.o save.o save_complete.o save_draw.o save_text.o \ schedule.o search.o sprite.o textselection.o theme.o \ theme_install.o thumbnail.o treeview.o ucstables.o uri.o \ @@ -85,7 +85,7 @@ OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o) # Inclusion of platform specific files has to occur after the OBJDIR stuff as # that is refered to in the files -OS = $(word 2,$(subst -, ,$(shell gcc -dumpmachine))) +OS = $(word 2,$(subst -, ,$(shell /usr/bin/gcc -dumpmachine))) ifeq ($(OS),riscos) include riscos.mk else @@ -180,7 +180,7 @@ utils/translit.c: transtab # available), remove */*.[ch] from the line below. # Under RISC OS, you may require *Set UnixFS$sfix "", if perl gives # "No such file or directory" errors. -depend: +depend: */*.[ch] @echo "--> modified files $?" @echo "--> updating dependencies" @-mkdir -p $(OBJDIR_RISCOS) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK)