[project @ 2005-04-17 16:42:05 by bursa]
Fix the debug and gtk builds. svn path=/import/netsurf/; revision=1661
This commit is contained in:
parent
fb8a9434ef
commit
6af1e81e52
|
@ -27,6 +27,8 @@ int done, destroyed;
|
|||
bool print_active = false;
|
||||
void *hotlist_toolbar = NULL;
|
||||
void *hotlist_window = NULL;
|
||||
struct browser_window *current_redraw_browser = NULL;
|
||||
struct gui_window *search_current_window = NULL;
|
||||
|
||||
#ifndef riscos
|
||||
char *default_stylesheet_url;
|
||||
|
@ -75,7 +77,8 @@ int main(int argc, char *argv[])
|
|||
c = fetchcache(url, callback, 0, 0, 1000, 1000, false,
|
||||
0, 0, true, false);
|
||||
if (c) {
|
||||
fetchcache_go(c, 0, callback, 0, 0, 0, 0, true);
|
||||
fetchcache_go(c, 0, callback, 0, 0, 1000, 1000,
|
||||
0, 0, true);
|
||||
done = c->status == CONTENT_STATUS_DONE;
|
||||
while (!done)
|
||||
fetch_poll();
|
||||
|
@ -185,3 +188,10 @@ void schedule(int t, void (*callback)(void *p), void *p) {}
|
|||
void schedule_remove(void (*callback)(void *p), void *p) {}
|
||||
void schedule_run(void) {}
|
||||
#endif
|
||||
|
||||
bool selection_highlighted(struct selection *s, struct box *box,
|
||||
unsigned *start_idx, unsigned *end_idx) { return false; }
|
||||
bool gui_search_term_highlighted(struct gui_window *g, struct box *box,
|
||||
unsigned *start_idx, unsigned *end_idx) { return false; }
|
||||
|
||||
const char *local_encoding_name(void) { return "ISO-8859-1"; }
|
||||
|
|
|
@ -163,3 +163,4 @@ void schedule_run(void) {}
|
|||
|
||||
void global_history_add(struct gui_window *g) {}
|
||||
|
||||
const char *local_encoding_name(void) { return "UTF-8"; }
|
||||
|
|
10
makefile
10
makefile
|
@ -23,13 +23,12 @@ 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 utf8.o \
|
||||
utils.o # utils/
|
||||
OBJECTS_COMMON += imagemap.o loginlist.o options.o selection.o \
|
||||
textinput.o tree.o # desktop/
|
||||
OBJECTS_COMMON += imagemap.o loginlist.o options.o tree.o # desktop/
|
||||
|
||||
OBJECTS_IMAGE = jpeg.o mng.o gif.o gifread.o # image/
|
||||
|
||||
OBJECTS_RISCOS = $(OBJECTS_COMMON) $(OBJECTS_IMAGE)
|
||||
OBJECTS_RISCOS += browser.o netsurf.o version.o # desktop/
|
||||
OBJECTS_RISCOS += browser.o netsurf.o selection.o textinput.o version.o # desktop/
|
||||
OBJECTS_RISCOS += 401login.o bitmap.o buffer.o debugwin.o \
|
||||
dialog.o download.o draw.o filetype.o font.o \
|
||||
global_history.o gui.o help.o history.o hotlist.o image.o \
|
||||
|
@ -50,11 +49,12 @@ OBJECTS_DEBUGRO += netsurfd.o # debug/
|
|||
OBJECTS_DEBUGRO += version.o # desktop/
|
||||
OBJECTS_DEBUGRO += bitmap.o draw.o filetype.o font.o \
|
||||
gif.o gifread.o image.o jpeg.o plotters.o save_complete.o \
|
||||
schedule.o sprite.o ufont.o # riscos/
|
||||
schedule.o sprite.o # riscos/
|
||||
|
||||
OBJECTS_GTK = $(OBJECTS_COMMON) $(OBJECTS_IMAGE)
|
||||
OBJECTS_GTK += filetyped.o # debug/
|
||||
OBJECTS_GTK += browser.o netsurf.o version.o # desktop/
|
||||
OBJECTS_GTK += browser.o netsurf.o selection.o textinput.o \
|
||||
version.o # desktop/
|
||||
OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \
|
||||
gtk_plotters.o gtk_treeview.o gtk_window.o # gtk/
|
||||
|
||||
|
|
4
posix.mk
4
posix.mk
|
@ -9,8 +9,8 @@ PLATFORM_CFLAGS_DEBUG = -I/usr/include/libxml2 -I/riscos/src/OSLib \
|
|||
|
||||
LDFLAGS_RISCOS = -L/home/riscos/env/lib -lxml2 -lz -lcurl -lssl -lcrypto \
|
||||
-lcares -lmng -loslib -ljpeg -lrufl
|
||||
LDFLAGS_SMALL = -L/riscos/lib -lxml2 -lz -lucurl -lcares -lmng -loslib -ljpeg \
|
||||
-lrufl
|
||||
LDFLAGS_SMALL = -L/home/riscos/env/lib -lxml2 -lz -lucurl -lcares -lmng \
|
||||
-loslib -ljpeg -lrufl
|
||||
LDFLAGS_DEBUG = -L/usr/lib -lxml2 -lz -lm -lcurl -lssl -lcrypto -ldl -lmng \
|
||||
-ljpeg -llcms
|
||||
|
||||
|
|
Loading…
Reference in New Issue