netsurf: branch master updated. ff2f1f1836f4a3b33bbfaafbb2bbdc2c1dba4d63
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/ff2f1f1836f4a3b33bbfa...
...commit http://git.netsurf-browser.org/netsurf.git/commit/ff2f1f1836f4a3b33bbfaaf...
...tree http://git.netsurf-browser.org/netsurf.git/tree/ff2f1f1836f4a3b33bbfaafbb...
The branch, master has been updated
via ff2f1f1836f4a3b33bbfaafbb2bbdc2c1dba4d63 (commit)
from e237ebac8f6cca443a52966de74934d98096be1f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/ff2f1f1836f4a3b33bb...
commit ff2f1f1836f4a3b33bbfaafbb2bbdc2c1dba4d63
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added missing copyright headers
diff --git a/atari/Makefile.target b/atari/Makefile.target
index f249b69..283d634 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -2,20 +2,23 @@
# Atari target setup
# ----------------------------------------------------------------------------
-ifeq ($(ATARI_ARCH),68020-60)
+ifeq ($(ATARI_ARCH),68000)
PRGSUFFIX := 000.app
+PKGNAME := ns000.zip
endif
ifeq ($(ATARI_ARCH),68020-60)
CFLAGS += -m68020-60
LDFLAGS += -m68020-60
PRGSUFFIX := 020.app
+PKGNAME := ns020.zip
endif
ifeq ($(ATARI_ARCH),5475)
CFLAGS += -mcpu=5475
LDFLAGS += -mcpu=5475
PRGSUFFIX := v4e.app
+PKGNAME := nsv4e.zip
endif
# non-pkgconfig components
@@ -83,10 +86,35 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
# Install target
# ----------------------------------------------------------------------------
-install-atari:
+ATARI_INSTALL_TARGET_DIR := nsatari.package
+ATARI_RES_DIR := atari/res
+
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-atari:
# ----------------------------------------------------------------------------
# Package target
# ----------------------------------------------------------------------------
-package-atari:
\ No newline at end of file
+package-atari: $(PKGNAME)
+ $(VQ)echo Creating $(PKGNAME)
+
+$(PKGNAME): $(EXETARGET)
+ $(Q)rm -rf $(ATARI_INSTALL_TARGET_DIR)
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/doc
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/download
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/fonts
+ #$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons
+ $(Q)touch $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/cookies
+ $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/netsurf.rsc
+ $(Q)cp $(ATARI_RES_DIR)/icons/ $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons/ -R
+
+
+ $(Q)cp $(EXETARGET) $(ATARI_INSTALL_TARGET_DIR)/netsurf
diff --git a/atari/ctxmenu.h b/atari/ctxmenu.h
index 1c0b131..079860d 100644
--- a/atari/ctxmenu.h
+++ b/atari/ctxmenu.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef CTXMENU_H_INCLUDED
#define CTXMENU_H_INCLUDED
diff --git a/atari/encoding.c b/atari/encoding.c
index 93737b5..2cd2670 100644
--- a/atari/encoding.c
+++ b/atari/encoding.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include "atari/encoding.h"
diff --git a/atari/encoding.h b/atari/encoding.h
index 80b51c8..7b9cc82 100644
--- a/atari/encoding.h
+++ b/atari/encoding.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef NS_ATARI_ENCODING_H
#define NS_ATARI_ENCODING_H
diff --git a/atari/font.c b/atari/font.c
index 7137658..afb1209 100755
--- a/atari/font.c
+++ b/atari/font.c
@@ -18,6 +18,24 @@
#include <inttypes.h>
#include <assert.h>
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <stdbool.h>
#include <windom.h>
diff --git a/atari/plot/fontplot.c b/atari/plot/fontplot.c
index ba4e267..b80965b 100644
--- a/atari/plot/fontplot.c
+++ b/atari/plot/fontplot.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2010 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include "atari/plot/fontplot.h"
const struct s_font_driver_table_entry font_driver_table[] =
diff --git a/atari/redrawslots.h b/atari/redrawslots.h
index ae4b77f..d1f0fc2 100644
--- a/atari/redrawslots.h
+++ b/atari/redrawslots.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
#ifndef ATARI_REDRAW_SLOTS_H
#define ATARI_REDRAW_SLOTS_H
diff --git a/atari/save.h b/atari/save.h
index 00852d0..0775723 100644
--- a/atari/save.h
+++ b/atari/save.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef NSATARI_SAVE_H
#define NSATARI_SAVE_H
diff --git a/atari/schedule.h b/atari/schedule.h
index 0ca3f91..e21b759 100755
--- a/atari/schedule.h
+++ b/atari/schedule.h
@@ -1,5 +1,6 @@
/*
* Copyright 2008 Vincent Sanders <vince(a)simtec.co.uk>
+ * 2012 Ole Loots <ole(a)monochrom.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
diff --git a/atari/search.c b/atari/search.c
index d23724b..b5e2fdd 100644
--- a/atari/search.c
+++ b/atari/search.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/atari/search.h b/atari/search.h
index 7521004..7913803 100644
--- a/atari/search.h
+++ b/atari/search.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef NS_ATARI_SEARCH_H
#define NS_ATARI_SEARCH_H
@@ -21,4 +39,4 @@ typedef struct s_search_form_session * SEARCH_FORM_SESSION;
SEARCH_FORM_SESSION open_browser_search(struct gui_window * gw);
void search_destroy( struct gui_window * gw );
-#endif
\ No newline at end of file
+#endif
diff --git a/atari/settings.c b/atari/settings.c
index b2a4baf..0192a97 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
@@ -228,7 +246,7 @@ static colour color_popup(int x, int y, colour current)
#define GRID_ROWS 9
#define GRID_COLS 27
colour retval = current;
- int boxwidth=6, boxheight=8;
+ int boxwidth=6, boxheight=8;
struct bitmap *palette_img;
MFDB bg, screen;
GRECT bgarea = {x, y, GRID_COLS*boxwidth+4, GRID_ROWS*boxheight+4};
@@ -250,23 +268,23 @@ static colour color_popup(int x, int y, colour current)
.stroke_width = 2,
.fill_type = PLOT_OP_TYPE_NONE,
.fill_colour = 0
- };
-
+ };
+
/* create a palette array (web colors): */
for (r=0; r<6; r++) {
for (g=0; g<6; g++) {
for (b=0; b<6; b++) {
- palette[i] = ((web_std_colors[b]<<16)
- | (web_std_colors[g]<<8)
- | web_std_colors[r]);
+ palette[i] = ((web_std_colors[b]<<16)
+ | (web_std_colors[g]<<8)
+ | web_std_colors[r]);
i++;
}
}
}
-
+
/* setup the gray color values: */
int z = 0;
- colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444,
+ colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444,
0x555555, 0x666666, 0x777777, 0x888888,
0x999999, 0x999999, 0xAAAAAA, 0xBBBBBB,
0xCCCCCC, 0xDDDDDD, 0xEEEEEE};
@@ -277,19 +295,19 @@ static colour color_popup(int x, int y, colour current)
palette[i] = 0x000000;
z++;
}
-
+
/* hide the mouse */
v_hide_c (app.graf.handle);
-
- plot_set_dimensions(x, y,
+
+ plot_set_dimensions(x, y,
(GRID_COLS*boxwidth)+4, (GRID_ROWS*boxheight)+4);
plot_lock();
- // store background:
+ // store background:
short pxy[8];
init_mfdb(app.nplanes, bgarea.g_w, bgarea.g_h, 0, &bg);
init_mfdb(0, bgarea.g_w, bgarea.g_h, 0, &screen);
-
+
pxy[0] = bgarea.g_x;
pxy[1] = bgarea.g_y;
pxy[2] = bgarea.g_x + bgarea.g_w - 1;
@@ -303,31 +321,31 @@ static colour color_popup(int x, int y, colour current)
vro_cpyfm (app.graf.handle, S_ONLY, pxy, &screen, &bg);
/*
- plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3,
+ plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3,
y+(GRID_ROWS*boxheight)+3, &outline);
-
+
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2,
&outline);
*/
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y,
&outline);
- plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2,
+ plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2,
y+(GRID_ROWS*boxheight)+2,
&outline);
/* draw a 27*8 grid: */
for (i=0; i<243; i++){
drawcolour.fill_colour = palette[i];
- plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2,
+ plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2,
&drawcolour);
xpos += boxwidth;
if (xpos >= GRID_COLS*boxwidth) {
xpos = 0;
ypos += boxheight;
- }
+ }
}
-
+
/* restore the mouse */
v_show_c ( app.graf.handle, 1);
@@ -339,7 +357,7 @@ static colour color_popup(int x, int y, colour current)
/* calulate clicked grid coords: */
int row = ((evnt.my-y)/boxheight);
int col = ((evnt.mx-x)/boxwidth);
-
+
if (row >= 0 && row <= GRID_ROWS-1 && col >= 0 && col <= GRID_COLS-1) {
assert( (GRID_COLS*row)+(col) >= 0 );
assert( (GRID_COLS*row)+(col) < 243 );
@@ -354,7 +372,7 @@ static colour color_popup(int x, int y, colour current)
#undef GRID_COLS
#undef GRID_ROWS
-
+
return(retval);
}
@@ -837,7 +855,7 @@ static void display_settings( void )
snprintf( spare, 255, "%3d", nsoption_int(font_size) );
set_text( CHOICES_EDIT_DEF_FONT_SIZE, spare , 3 );
- set_text(CHOICES_BT_TOOLBAR_ICONSET,
+ set_text(CHOICES_BT_TOOLBAR_ICONSET,
nsoption_charp(atari_image_toolbar_folder), LABEL_ICONSET_MAX_LEN);
tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg);
-----------------------------------------------------------------------
Summary of changes:
atari/Makefile.target | 34 ++++++++++++++++++++++++--
atari/ctxmenu.h | 18 ++++++++++++++
atari/encoding.c | 18 ++++++++++++++
atari/encoding.h | 18 ++++++++++++++
atari/font.c | 18 ++++++++++++++
atari/plot/fontplot.c | 18 ++++++++++++++
atari/redrawslots.h | 19 +++++++++++++++
atari/save.h | 18 ++++++++++++++
atari/schedule.h | 1 +
atari/search.c | 18 ++++++++++++++
atari/search.h | 20 +++++++++++++++-
atari/settings.c | 62 +++++++++++++++++++++++++++++++-----------------
12 files changed, 236 insertions(+), 26 deletions(-)
diff --git a/atari/Makefile.target b/atari/Makefile.target
index f249b69..283d634 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -2,20 +2,23 @@
# Atari target setup
# ----------------------------------------------------------------------------
-ifeq ($(ATARI_ARCH),68020-60)
+ifeq ($(ATARI_ARCH),68000)
PRGSUFFIX := 000.app
+PKGNAME := ns000.zip
endif
ifeq ($(ATARI_ARCH),68020-60)
CFLAGS += -m68020-60
LDFLAGS += -m68020-60
PRGSUFFIX := 020.app
+PKGNAME := ns020.zip
endif
ifeq ($(ATARI_ARCH),5475)
CFLAGS += -mcpu=5475
LDFLAGS += -mcpu=5475
PRGSUFFIX := v4e.app
+PKGNAME := nsv4e.zip
endif
# non-pkgconfig components
@@ -83,10 +86,35 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
# Install target
# ----------------------------------------------------------------------------
-install-atari:
+ATARI_INSTALL_TARGET_DIR := nsatari.package
+ATARI_RES_DIR := atari/res
+
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-atari:
# ----------------------------------------------------------------------------
# Package target
# ----------------------------------------------------------------------------
-package-atari:
\ No newline at end of file
+package-atari: $(PKGNAME)
+ $(VQ)echo Creating $(PKGNAME)
+
+$(PKGNAME): $(EXETARGET)
+ $(Q)rm -rf $(ATARI_INSTALL_TARGET_DIR)
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/doc
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/download
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res
+ $(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/fonts
+ #$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons
+ $(Q)touch $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/cookies
+ $(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/netsurf.rsc
+ $(Q)cp $(ATARI_RES_DIR)/icons/ $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons/ -R
+
+
+ $(Q)cp $(EXETARGET) $(ATARI_INSTALL_TARGET_DIR)/netsurf
diff --git a/atari/ctxmenu.h b/atari/ctxmenu.h
index 1c0b131..079860d 100644
--- a/atari/ctxmenu.h
+++ b/atari/ctxmenu.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef CTXMENU_H_INCLUDED
#define CTXMENU_H_INCLUDED
diff --git a/atari/encoding.c b/atari/encoding.c
index 93737b5..2cd2670 100644
--- a/atari/encoding.c
+++ b/atari/encoding.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include "atari/encoding.h"
diff --git a/atari/encoding.h b/atari/encoding.h
index 80b51c8..7b9cc82 100644
--- a/atari/encoding.h
+++ b/atari/encoding.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef NS_ATARI_ENCODING_H
#define NS_ATARI_ENCODING_H
diff --git a/atari/font.c b/atari/font.c
index 7137658..afb1209 100755
--- a/atari/font.c
+++ b/atari/font.c
@@ -18,6 +18,24 @@
#include <inttypes.h>
#include <assert.h>
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <stdbool.h>
#include <windom.h>
diff --git a/atari/plot/fontplot.c b/atari/plot/fontplot.c
index ba4e267..b80965b 100644
--- a/atari/plot/fontplot.c
+++ b/atari/plot/fontplot.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2010 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include "atari/plot/fontplot.h"
const struct s_font_driver_table_entry font_driver_table[] =
diff --git a/atari/redrawslots.h b/atari/redrawslots.h
index ae4b77f..d1f0fc2 100644
--- a/atari/redrawslots.h
+++ b/atari/redrawslots.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
#ifndef ATARI_REDRAW_SLOTS_H
#define ATARI_REDRAW_SLOTS_H
diff --git a/atari/save.h b/atari/save.h
index 00852d0..0775723 100644
--- a/atari/save.h
+++ b/atari/save.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef NSATARI_SAVE_H
#define NSATARI_SAVE_H
diff --git a/atari/schedule.h b/atari/schedule.h
index 0ca3f91..e21b759 100755
--- a/atari/schedule.h
+++ b/atari/schedule.h
@@ -1,5 +1,6 @@
/*
* Copyright 2008 Vincent Sanders <vince(a)simtec.co.uk>
+ * 2012 Ole Loots <ole(a)monochrom.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
diff --git a/atari/search.c b/atari/search.c
index d23724b..b5e2fdd 100644
--- a/atari/search.c
+++ b/atari/search.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/atari/search.h b/atari/search.h
index 7521004..7913803 100644
--- a/atari/search.h
+++ b/atari/search.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef NS_ATARI_SEARCH_H
#define NS_ATARI_SEARCH_H
@@ -21,4 +39,4 @@ typedef struct s_search_form_session * SEARCH_FORM_SESSION;
SEARCH_FORM_SESSION open_browser_search(struct gui_window * gw);
void search_destroy( struct gui_window * gw );
-#endif
\ No newline at end of file
+#endif
diff --git a/atari/settings.c b/atari/settings.c
index b2a4baf..0192a97 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2012 Ole Loots <ole(a)monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
@@ -228,7 +246,7 @@ static colour color_popup(int x, int y, colour current)
#define GRID_ROWS 9
#define GRID_COLS 27
colour retval = current;
- int boxwidth=6, boxheight=8;
+ int boxwidth=6, boxheight=8;
struct bitmap *palette_img;
MFDB bg, screen;
GRECT bgarea = {x, y, GRID_COLS*boxwidth+4, GRID_ROWS*boxheight+4};
@@ -250,23 +268,23 @@ static colour color_popup(int x, int y, colour current)
.stroke_width = 2,
.fill_type = PLOT_OP_TYPE_NONE,
.fill_colour = 0
- };
-
+ };
+
/* create a palette array (web colors): */
for (r=0; r<6; r++) {
for (g=0; g<6; g++) {
for (b=0; b<6; b++) {
- palette[i] = ((web_std_colors[b]<<16)
- | (web_std_colors[g]<<8)
- | web_std_colors[r]);
+ palette[i] = ((web_std_colors[b]<<16)
+ | (web_std_colors[g]<<8)
+ | web_std_colors[r]);
i++;
}
}
}
-
+
/* setup the gray color values: */
int z = 0;
- colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444,
+ colour grays[15] = {0x111111, 0x222222, 0x333333, 0x444444,
0x555555, 0x666666, 0x777777, 0x888888,
0x999999, 0x999999, 0xAAAAAA, 0xBBBBBB,
0xCCCCCC, 0xDDDDDD, 0xEEEEEE};
@@ -277,19 +295,19 @@ static colour color_popup(int x, int y, colour current)
palette[i] = 0x000000;
z++;
}
-
+
/* hide the mouse */
v_hide_c (app.graf.handle);
-
- plot_set_dimensions(x, y,
+
+ plot_set_dimensions(x, y,
(GRID_COLS*boxwidth)+4, (GRID_ROWS*boxheight)+4);
plot_lock();
- // store background:
+ // store background:
short pxy[8];
init_mfdb(app.nplanes, bgarea.g_w, bgarea.g_h, 0, &bg);
init_mfdb(0, bgarea.g_w, bgarea.g_h, 0, &screen);
-
+
pxy[0] = bgarea.g_x;
pxy[1] = bgarea.g_y;
pxy[2] = bgarea.g_x + bgarea.g_w - 1;
@@ -303,31 +321,31 @@ static colour color_popup(int x, int y, colour current)
vro_cpyfm (app.graf.handle, S_ONLY, pxy, &screen, &bg);
/*
- plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3,
+ plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3,
y+(GRID_ROWS*boxheight)+3, &outline);
-
+
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2,
&outline);
*/
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y,
&outline);
- plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2,
+ plot_line(x, y+(GRID_ROWS*boxheight)+2, x+(GRID_COLS*boxwidth)+2,
y+(GRID_ROWS*boxheight)+2,
&outline);
/* draw a 27*8 grid: */
for (i=0; i<243; i++){
drawcolour.fill_colour = palette[i];
- plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2,
+ plot_rectangle(xpos+2, ypos+2, xpos+boxwidth+2, ypos+boxheight+2,
&drawcolour);
xpos += boxwidth;
if (xpos >= GRID_COLS*boxwidth) {
xpos = 0;
ypos += boxheight;
- }
+ }
}
-
+
/* restore the mouse */
v_show_c ( app.graf.handle, 1);
@@ -339,7 +357,7 @@ static colour color_popup(int x, int y, colour current)
/* calulate clicked grid coords: */
int row = ((evnt.my-y)/boxheight);
int col = ((evnt.mx-x)/boxwidth);
-
+
if (row >= 0 && row <= GRID_ROWS-1 && col >= 0 && col <= GRID_COLS-1) {
assert( (GRID_COLS*row)+(col) >= 0 );
assert( (GRID_COLS*row)+(col) < 243 );
@@ -354,7 +372,7 @@ static colour color_popup(int x, int y, colour current)
#undef GRID_COLS
#undef GRID_ROWS
-
+
return(retval);
}
@@ -837,7 +855,7 @@ static void display_settings( void )
snprintf( spare, 255, "%3d", nsoption_int(font_size) );
set_text( CHOICES_EDIT_DEF_FONT_SIZE, spare , 3 );
- set_text(CHOICES_BT_TOOLBAR_ICONSET,
+ set_text(CHOICES_BT_TOOLBAR_ICONSET,
nsoption_charp(atari_image_toolbar_folder), LABEL_ICONSET_MAX_LEN);
tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg);
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. e237ebac8f6cca443a52966de74934d98096be1f
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e237ebac8f6cca443a529...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e237ebac8f6cca443a52966...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e237ebac8f6cca443a52966de...
The branch, master has been updated
via e237ebac8f6cca443a52966de74934d98096be1f (commit)
from e85284d7d15f8f64dc8074e57526ef100a9793bf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/e237ebac8f6cca443a5...
commit e237ebac8f6cca443a52966de74934d98096be1f
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
Split install and package targets.
Install target is for installing on the local machine and package generates a package
diff --git a/Makefile b/Makefile
index 0dce8c8..da0d41e 100644
--- a/Makefile
+++ b/Makefile
@@ -633,61 +633,14 @@ $(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \
$(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \
$(call compile_target_s,$(SOURCE),$(subst /,_,$(SOURCE:.s=.o)),$(subst /,_,$(SOURCE:.s=.d)))))
-.PHONY: all clean docs install install-gtk
+.PHONY: all clean docs install package-$(TARGET) package install-$(TARGET)
clean: $(CLEANS)
-install-gtk: nsgtk
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
- mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
- @cp nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
- @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install translations
- @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install glade templates
- @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
-
-install-beos: NetSurf
-# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- @copyattr -d NetSurf $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- gzip -9v < beos/res/messages > $(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
-
-
-install-framebuffer: $(EXETARGET)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
- @cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
- @for F in default.css messages; do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+# Target builds a distribution package
+package: all-program package-$(TARGET)
+# Target installs executable on the host system
install: all-program install-$(TARGET)
docs:
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index c8046b4..bb2b1c7 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -95,7 +95,13 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF)
# Install target
# ----------------------------------------------------------------------------
-install-amiga: netsurf.lha
+install-amiga:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-amiga: netsurf.lha
AMIGA_LANGUAGES := de en fr it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
@@ -108,7 +114,7 @@ AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))
AMIGA_DISTRIBUTION_FILES := amiga/dist/*
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
-netsurf.lha: NetSurf
+netsurf.lha: $(EXETARGET)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
$(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
diff --git a/atari/Makefile.target b/atari/Makefile.target
index cbd8e6f..f249b69 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -79,4 +79,14 @@ S_ATARI := $(addprefix atari/,$(S_ATARI))
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-atari:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+package-atari:
\ No newline at end of file
diff --git a/beos/Makefile.target b/beos/Makefile.target
index ec8719e..be58be4 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -111,3 +111,27 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
EXETARGET := NetSurf
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-beos:
+# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+ @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ gzip -9v < beos/res/messages > $(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-beos:
\ No newline at end of file
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index b3ababd..635790a 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -187,6 +187,12 @@ endef
$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix cocoa/res/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
$(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call compile_xib,$(xib),$(lang)))))
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-cocoa: NetSurf.app
+
NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES) NetSurf.app/Contents/Info.plist
$(VQ)echo Assembling NetSurf.app bundle
$(Q)mkdir -p NetSurf.app/Contents/MacOS
@@ -206,6 +212,12 @@ NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar
-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/' \
< cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-cocoa: NetSurf.dmg
+
NetSurf.tmp.dmg: NetSurf.app
hdiutil create -size 8m -fs HFS+ -volname "NetSurf" $@
hdiutil attach $@
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 974427a..8cca120 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -154,4 +154,20 @@ S_FRAMEBUFFER := $(addprefix framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuf
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES)
-EXETARGET := nsfb$(SUBTARGET)
+EXETARGET := nsfb
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-framebuffer:
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ @cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
+ @for F in default.css messages; do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-framebuffer:
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 0fd0acf..3934d13 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf GTK target
+#
+# This file is part of NetSurf
+#
# ----------------------------------------------------------------------------
# GTK flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -118,3 +123,43 @@ S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_PIXBUF) $(S_GTK)
EXETARGET := nsgtk
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-gtk:
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ @cp $< $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
+ @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install translations
+ @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install glade templates
+ @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-gtk:
diff --git a/monkey/Makefile.target b/monkey/Makefile.target
index 3524b31..b72734f 100644
--- a/monkey/Makefile.target
+++ b/monkey/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf monkey target
+#
+# This file is part of NetSurf
+
# ----------------------------------------------------------------------------
# Monkey flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -65,3 +70,15 @@ S_MONKEY := $(addprefix monkey/,$(S_MONKEY))
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_MONKEY)
EXETARGET := nsmonkey
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-monkey:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-monkey:
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index 44d57c5..2dd246a 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -1,4 +1,7 @@
-# RISC OS Target makefile
+#
+# Makefile for NetSurf RISC OS target
+#
+# This file is part of NetSurf
# ----------------------------------------------------------------------------
# RISC OS target setup
@@ -105,6 +108,14 @@ CLEANS += clean-run
# Install target
# ----------------------------------------------------------------------------
+install-riscos:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-riscos: netsurf.zip
+
netsurf.zip: $(EXETARGET)
$(eval $@_TMPDIR := $(shell mktemp -d))
$(Q) $(RM) $@
diff --git a/windows/Makefile.target b/windows/Makefile.target
index f19d3ac..f358999 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -1,6 +1,7 @@
-# ----------------------------------------------------------------------------
-# Windows target setup
-# ----------------------------------------------------------------------------
+#
+# Makefile for NetSurf Windows target
+#
+# This file is part of NetSurf
LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib
CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/
@@ -76,7 +77,13 @@ EXETARGET := NetSurf.exe
# Install target
# ----------------------------------------------------------------------------
-install-windows: netsurf-installer.exe
+install-windows:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-windows: netsurf-installer.exe
WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css messages
WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ))
-----------------------------------------------------------------------
Summary of changes:
Makefile | 55 +++---------------------------------------
amiga/Makefile.target | 10 ++++++-
atari/Makefile.target | 10 ++++++++
beos/Makefile.target | 24 ++++++++++++++++++
cocoa/Makefile.target | 12 +++++++++
framebuffer/Makefile.target | 18 +++++++++++++-
gtk/Makefile.target | 45 +++++++++++++++++++++++++++++++++++
monkey/Makefile.target | 17 +++++++++++++
riscos/Makefile.target | 13 +++++++++-
windows/Makefile.target | 15 ++++++++---
10 files changed, 160 insertions(+), 59 deletions(-)
diff --git a/Makefile b/Makefile
index 0dce8c8..da0d41e 100644
--- a/Makefile
+++ b/Makefile
@@ -633,61 +633,14 @@ $(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \
$(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \
$(call compile_target_s,$(SOURCE),$(subst /,_,$(SOURCE:.s=.o)),$(subst /,_,$(SOURCE:.s=.d)))))
-.PHONY: all clean docs install install-gtk
+.PHONY: all clean docs install package-$(TARGET) package install-$(TARGET)
clean: $(CLEANS)
-install-gtk: nsgtk
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
- mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
- @cp nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
- @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install translations
- @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install glade templates
- @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
-
-install-beos: NetSurf
-# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- @copyattr -d NetSurf $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- gzip -9v < beos/res/messages > $(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
-
-
-install-framebuffer: $(EXETARGET)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
- @cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
- @for F in default.css messages; do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+# Target builds a distribution package
+package: all-program package-$(TARGET)
+# Target installs executable on the host system
install: all-program install-$(TARGET)
docs:
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index c8046b4..bb2b1c7 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -95,7 +95,13 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF)
# Install target
# ----------------------------------------------------------------------------
-install-amiga: netsurf.lha
+install-amiga:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-amiga: netsurf.lha
AMIGA_LANGUAGES := de en fr it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
@@ -108,7 +114,7 @@ AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))
AMIGA_DISTRIBUTION_FILES := amiga/dist/*
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
-netsurf.lha: NetSurf
+netsurf.lha: $(EXETARGET)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
$(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
diff --git a/atari/Makefile.target b/atari/Makefile.target
index cbd8e6f..f249b69 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -79,4 +79,14 @@ S_ATARI := $(addprefix atari/,$(S_ATARI))
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-atari:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+package-atari:
\ No newline at end of file
diff --git a/beos/Makefile.target b/beos/Makefile.target
index ec8719e..be58be4 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -111,3 +111,27 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
EXETARGET := NetSurf
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-beos:
+# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+ @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ gzip -9v < beos/res/messages > $(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-beos:
\ No newline at end of file
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index b3ababd..635790a 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -187,6 +187,12 @@ endef
$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix cocoa/res/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
$(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call compile_xib,$(xib),$(lang)))))
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-cocoa: NetSurf.app
+
NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES) NetSurf.app/Contents/Info.plist
$(VQ)echo Assembling NetSurf.app bundle
$(Q)mkdir -p NetSurf.app/Contents/MacOS
@@ -206,6 +212,12 @@ NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar
-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/' \
< cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-cocoa: NetSurf.dmg
+
NetSurf.tmp.dmg: NetSurf.app
hdiutil create -size 8m -fs HFS+ -volname "NetSurf" $@
hdiutil attach $@
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 974427a..8cca120 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -154,4 +154,20 @@ S_FRAMEBUFFER := $(addprefix framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuf
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES)
-EXETARGET := nsfb$(SUBTARGET)
+EXETARGET := nsfb
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-framebuffer:
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ @cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
+ @for F in default.css messages; do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-framebuffer:
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 0fd0acf..3934d13 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf GTK target
+#
+# This file is part of NetSurf
+#
# ----------------------------------------------------------------------------
# GTK flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -118,3 +123,43 @@ S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_PIXBUF) $(S_GTK)
EXETARGET := nsgtk
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-gtk:
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ @cp $< $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
+ @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install translations
+ @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install glade templates
+ @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-gtk:
diff --git a/monkey/Makefile.target b/monkey/Makefile.target
index 3524b31..b72734f 100644
--- a/monkey/Makefile.target
+++ b/monkey/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf monkey target
+#
+# This file is part of NetSurf
+
# ----------------------------------------------------------------------------
# Monkey flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -65,3 +70,15 @@ S_MONKEY := $(addprefix monkey/,$(S_MONKEY))
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_MONKEY)
EXETARGET := nsmonkey
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-monkey:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-monkey:
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index 44d57c5..2dd246a 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -1,4 +1,7 @@
-# RISC OS Target makefile
+#
+# Makefile for NetSurf RISC OS target
+#
+# This file is part of NetSurf
# ----------------------------------------------------------------------------
# RISC OS target setup
@@ -105,6 +108,14 @@ CLEANS += clean-run
# Install target
# ----------------------------------------------------------------------------
+install-riscos:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-riscos: netsurf.zip
+
netsurf.zip: $(EXETARGET)
$(eval $@_TMPDIR := $(shell mktemp -d))
$(Q) $(RM) $@
diff --git a/windows/Makefile.target b/windows/Makefile.target
index f19d3ac..f358999 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -1,6 +1,7 @@
-# ----------------------------------------------------------------------------
-# Windows target setup
-# ----------------------------------------------------------------------------
+#
+# Makefile for NetSurf Windows target
+#
+# This file is part of NetSurf
LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib
CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/
@@ -76,7 +77,13 @@ EXETARGET := NetSurf.exe
# Install target
# ----------------------------------------------------------------------------
-install-windows: netsurf-installer.exe
+install-windows:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-windows: netsurf-installer.exe
WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css messages
WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ))
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. e85284d7d15f8f64dc8074e57526ef100a9793bf
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e85284d7d15f8f64dc807...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e85284d7d15f8f64dc8074e...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e85284d7d15f8f64dc8074e57...
The branch, master has been updated
via e85284d7d15f8f64dc8074e57526ef100a9793bf (commit)
via 887a2ca18638755f74594913b7e07ac41b27e8a6 (commit)
from c67187079e034ad2a0fe41521b9068f02a6f103d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/e85284d7d15f8f64dc8...
commit e85284d7d15f8f64dc8074e57526ef100a9793bf
Merge: 887a2ca c671870
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/887a2ca18638755f745...
commit 887a2ca18638755f74594913b7e07ac41b27e8a6
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added and use PRGSUFFIX to configure executable name.
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 259f5b6..cbd8e6f 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -3,13 +3,19 @@
# ----------------------------------------------------------------------------
ifeq ($(ATARI_ARCH),68020-60)
+PRGSUFFIX := 000.app
+endif
+
+ifeq ($(ATARI_ARCH),68020-60)
CFLAGS += -m68020-60
LDFLAGS += -m68020-60
+PRGSUFFIX := 020.app
endif
ifeq ($(ATARI_ARCH),5475)
CFLAGS += -mcpu=5475
LDFLAGS += -mcpu=5475
+PRGSUFFIX := v4e.app
endif
# non-pkgconfig components
@@ -71,6 +77,6 @@ S_ATARI := $(addprefix atari/,$(S_ATARI))
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
-EXETARGET := ns$(SUBTARGET).prg
+EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
-----------------------------------------------------------------------
Summary of changes:
atari/Makefile.target | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 259f5b6..cbd8e6f 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -3,13 +3,19 @@
# ----------------------------------------------------------------------------
ifeq ($(ATARI_ARCH),68020-60)
+PRGSUFFIX := 000.app
+endif
+
+ifeq ($(ATARI_ARCH),68020-60)
CFLAGS += -m68020-60
LDFLAGS += -m68020-60
+PRGSUFFIX := 020.app
endif
ifeq ($(ATARI_ARCH),5475)
CFLAGS += -mcpu=5475
LDFLAGS += -mcpu=5475
+PRGSUFFIX := v4e.app
endif
# non-pkgconfig components
@@ -71,6 +77,6 @@ S_ATARI := $(addprefix atari/,$(S_ATARI))
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
-EXETARGET := ns$(SUBTARGET).prg
+EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. c67187079e034ad2a0fe41521b9068f02a6f103d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/c67187079e034ad2a0fe4...
...commit http://git.netsurf-browser.org/netsurf.git/commit/c67187079e034ad2a0fe415...
...tree http://git.netsurf-browser.org/netsurf.git/tree/c67187079e034ad2a0fe41521...
The branch, master has been updated
via c67187079e034ad2a0fe41521b9068f02a6f103d (commit)
from 654609887678aef9b62ba62b6427de0b9fc9bdb2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/c67187079e034ad2a0f...
commit c67187079e034ad2a0fe41521b9068f02a6f103d
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Improve object status message handling.
diff --git a/render/html.c b/render/html.c
index d37a624..a4725ca 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1173,7 +1173,11 @@ html_object_callback(hlcache_handle *object,
case CONTENT_MSG_STATUS:
if (event->data.explicit_status_text == NULL) {
/* Object content's status text updated */
- html_set_status(c, content_get_status_message(object));
+ union content_msg_data data;
+ data.explicit_status_text =
+ content_get_status_message(object);
+ html_set_status(c, data.explicit_status_text);
+ content_broadcast(&c->base, CONTENT_MSG_STATUS, data);
} else {
/* Object content wants to set explicit message */
content_broadcast(&c->base, CONTENT_MSG_STATUS,
-----------------------------------------------------------------------
Summary of changes:
render/html.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/render/html.c b/render/html.c
index d37a624..a4725ca 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1173,7 +1173,11 @@ html_object_callback(hlcache_handle *object,
case CONTENT_MSG_STATUS:
if (event->data.explicit_status_text == NULL) {
/* Object content's status text updated */
- html_set_status(c, content_get_status_message(object));
+ union content_msg_data data;
+ data.explicit_status_text =
+ content_get_status_message(object);
+ html_set_status(c, data.explicit_status_text);
+ content_broadcast(&c->base, CONTENT_MSG_STATUS, data);
} else {
/* Object content wants to set explicit message */
content_broadcast(&c->base, CONTENT_MSG_STATUS,
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. 654609887678aef9b62ba62b6427de0b9fc9bdb2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/654609887678aef9b62ba...
...commit http://git.netsurf-browser.org/netsurf.git/commit/654609887678aef9b62ba62...
...tree http://git.netsurf-browser.org/netsurf.git/tree/654609887678aef9b62ba62b6...
The branch, master has been updated
via 654609887678aef9b62ba62b6427de0b9fc9bdb2 (commit)
from bc8fee46f73307aba2f567ec1e35bd187b706eb8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/654609887678aef9b62...
commit 654609887678aef9b62ba62b6427de0b9fc9bdb2
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix scaled html object rendering.
diff --git a/render/html_redraw.c b/render/html_redraw.c
index eebd513..c9a163e 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -667,6 +667,11 @@ bool html_redraw_box(const html_content *html, struct box *box,
obj_data.repeat_x = false;
obj_data.repeat_y = false;
+ if (content_get_type(box->object) == CONTENT_HTML) {
+ obj_data.x /= scale;
+ obj_data.y /= scale;
+ }
+
if (!content_redraw(box->object, &obj_data, &r, ctx))
return false;
-----------------------------------------------------------------------
Summary of changes:
render/html_redraw.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/render/html_redraw.c b/render/html_redraw.c
index eebd513..c9a163e 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -667,6 +667,11 @@ bool html_redraw_box(const html_content *html, struct box *box,
obj_data.repeat_x = false;
obj_data.repeat_y = false;
+ if (content_get_type(box->object) == CONTENT_HTML) {
+ obj_data.x /= scale;
+ obj_data.y /= scale;
+ }
+
if (!content_redraw(box->object, &obj_data, &r, ctx))
return false;
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. bc8fee46f73307aba2f567ec1e35bd187b706eb8
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/bc8fee46f73307aba2f56...
...commit http://git.netsurf-browser.org/netsurf.git/commit/bc8fee46f73307aba2f567e...
...tree http://git.netsurf-browser.org/netsurf.git/tree/bc8fee46f73307aba2f567ec1...
The branch, master has been updated
via bc8fee46f73307aba2f567ec1e35bd187b706eb8 (commit)
via 4357f5e9d72b0f4efe939e02a7012fc60d43095d (commit)
from 37d148f4d790cdfb756ea6348a15da8c3d75fdff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/bc8fee46f73307aba2f...
commit bc8fee46f73307aba2f567ec1e35bd187b706eb8
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix scaled tiled image rendering.
diff --git a/gtk/plotters.c b/gtk/plotters.c
index fbf3d58..3af55b9 100644
--- a/gtk/plotters.c
+++ b/gtk/plotters.c
@@ -414,9 +414,6 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height,
return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg);
}
- width = bitmap_get_width(bitmap);
- height = bitmap_get_height(bitmap);
-
if (y > cliprect.y) {
doneheight = (cliprect.y - height) + ((y - cliprect.y) % height);
} else {
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/4357f5e9d72b0f4efe9...
commit 4357f5e9d72b0f4efe939e02a7012fc60d43095d
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Test for zero width/height at the start.
diff --git a/gtk/plotters.c b/gtk/plotters.c
index 2f2b111..fbf3d58 100644
--- a/gtk/plotters.c
+++ b/gtk/plotters.c
@@ -404,6 +404,11 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height,
bool repeat_x = (flags & BITMAPF_REPEAT_X);
bool repeat_y = (flags & BITMAPF_REPEAT_Y);
+ /* Bail early if we can */
+ if (width == 0 || height == 0)
+ /* Nothing to plot */
+ return true;
+
if (!(repeat_x || repeat_y)) {
/* Not repeating at all, so just pass it on */
return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg);
@@ -412,11 +417,6 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height,
width = bitmap_get_width(bitmap);
height = bitmap_get_height(bitmap);
- /* Bail early if we can */
- if (width == 0 || height == 0)
- /* Nothing to plot */
- return true;
-
if (y > cliprect.y) {
doneheight = (cliprect.y - height) + ((y - cliprect.y) % height);
} else {
-----------------------------------------------------------------------
Summary of changes:
gtk/plotters.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/gtk/plotters.c b/gtk/plotters.c
index 2f2b111..3af55b9 100644
--- a/gtk/plotters.c
+++ b/gtk/plotters.c
@@ -404,19 +404,16 @@ static bool nsgtk_plot_bitmap(int x, int y, int width, int height,
bool repeat_x = (flags & BITMAPF_REPEAT_X);
bool repeat_y = (flags & BITMAPF_REPEAT_Y);
- if (!(repeat_x || repeat_y)) {
- /* Not repeating at all, so just pass it on */
- return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg);
- }
-
- width = bitmap_get_width(bitmap);
- height = bitmap_get_height(bitmap);
-
/* Bail early if we can */
if (width == 0 || height == 0)
/* Nothing to plot */
return true;
+ if (!(repeat_x || repeat_y)) {
+ /* Not repeating at all, so just pass it on */
+ return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg);
+ }
+
if (y > cliprect.y) {
doneheight = (cliprect.y - height) + ((y - cliprect.y) % height);
} else {
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. 37d148f4d790cdfb756ea6348a15da8c3d75fdff
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/37d148f4d790cdfb756ea...
...commit http://git.netsurf-browser.org/netsurf.git/commit/37d148f4d790cdfb756ea63...
...tree http://git.netsurf-browser.org/netsurf.git/tree/37d148f4d790cdfb756ea6348...
The branch, master has been updated
via 37d148f4d790cdfb756ea6348a15da8c3d75fdff (commit)
from 311953f453d2c32ba792e8676e944a9795f5a9c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/37d148f4d790cdfb756...
commit 37d148f4d790cdfb756ea6348a15da8c3d75fdff
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Stab at fixing beos build for private bw struct.
diff --git a/beos/gui.cpp b/beos/gui.cpp
index c557723..4b16022 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -49,7 +49,7 @@ extern "C" {
#include "content/fetchers/resource.h"
#include "content/urldb.h"
#include "desktop/401login.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/cookies.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index fc497e3..4003b09 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -41,7 +41,7 @@
#include <fs_attr.h>
extern "C" {
#include "content/content.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
diff --git a/beos/window.cpp b/beos/window.cpp
index 1879892..253b5d1 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -23,7 +23,7 @@
extern "C" {
#include "content/urldb.h"
#include "css/utils.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/options.h"
#include "desktop/selection.h"
-----------------------------------------------------------------------
Summary of changes:
beos/gui.cpp | 2 +-
beos/scaffolding.cpp | 2 +-
beos/window.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/beos/gui.cpp b/beos/gui.cpp
index c557723..4b16022 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -49,7 +49,7 @@ extern "C" {
#include "content/fetchers/resource.h"
#include "content/urldb.h"
#include "desktop/401login.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/cookies.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index fc497e3..4003b09 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -41,7 +41,7 @@
#include <fs_attr.h>
extern "C" {
#include "content/content.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
diff --git a/beos/window.cpp b/beos/window.cpp
index 1879892..253b5d1 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -23,7 +23,7 @@
extern "C" {
#include "content/urldb.h"
#include "css/utils.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/options.h"
#include "desktop/selection.h"
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. 311953f453d2c32ba792e8676e944a9795f5a9c9
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/311953f453d2c32ba792e...
...commit http://git.netsurf-browser.org/netsurf.git/commit/311953f453d2c32ba792e86...
...tree http://git.netsurf-browser.org/netsurf.git/tree/311953f453d2c32ba792e8676...
The branch, master has been updated
via 311953f453d2c32ba792e8676e944a9795f5a9c9 (commit)
from 32c4fdeead33e9106343f91d76072d00b47565e3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/311953f453d2c32ba79...
commit 311953f453d2c32ba792e8676e944a9795f5a9c9
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
add missing include for browser private
diff --git a/atari/search.c b/atari/search.c
index f2e2383..d23724b 100644
--- a/atari/search.c
+++ b/atari/search.c
@@ -9,6 +9,7 @@
#include "desktop/gui.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/search.h"
#include "utils/log.h"
#include "utils/messages.h"
-----------------------------------------------------------------------
Summary of changes:
atari/search.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/atari/search.c b/atari/search.c
index f2e2383..d23724b 100644
--- a/atari/search.c
+++ b/atari/search.c
@@ -9,6 +9,7 @@
#include "desktop/gui.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/search.h"
#include "utils/log.h"
#include "utils/messages.h"
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. 32c4fdeead33e9106343f91d76072d00b47565e3
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/32c4fdeead33e9106343f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/32c4fdeead33e9106343f91...
...tree http://git.netsurf-browser.org/netsurf.git/tree/32c4fdeead33e9106343f91d7...
The branch, master has been updated
via 32c4fdeead33e9106343f91d76072d00b47565e3 (commit)
via 792e8881696147755dfae2a38364061926404706 (commit)
via 7604b76161b16d11a4d70859a03a1c40d415a7ce (commit)
from 29356734eb6d537d606a5f00c040b3619d061519 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/32c4fdeead33e910634...
commit 32c4fdeead33e9106343f91d76072d00b47565e3
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
add includes to get browser private struct on atari
diff --git a/atari/browser.c b/atari/browser.c
index 0c043b3..f88610a 100755
--- a/atari/browser.c
+++ b/atari/browser.c
@@ -34,6 +34,7 @@
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "content/content.h"
diff --git a/atari/browser_win.c b/atari/browser_win.c
index 1babbad..9887083 100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
@@ -34,6 +34,7 @@
#include "desktop/history_core.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 2230e00..79395ca 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "content/content.h"
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
index f002f3f..1a0e8f6 100755
--- a/atari/global_evnt.c
+++ b/atari/global_evnt.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "desktop/hotlist.h"
diff --git a/atari/gui.c b/atari/gui.c
index 8142394..e500ad6 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -46,6 +46,7 @@
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "render/font.h"
#include "utils/schedule.h"
diff --git a/atari/toolbar.c b/atari/toolbar.c
index b6dc468..3594d24 100755
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -33,6 +33,7 @@
#include "desktop/history_core.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/792e8881696147755df...
commit 792e8881696147755dfae2a38364061926404706
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
remove comment after checking correctness of sources
diff --git a/javascript/jsapi/htmldocument.c b/javascript/jsapi/htmldocument.c
index 1a58e4e..260f368 100644
--- a/javascript/jsapi/htmldocument.c
+++ b/javascript/jsapi/htmldocument.c
@@ -25,9 +25,6 @@
/* IDL http://www.whatwg.org/specs/web-apps/current-work/#the-document-object
-NOTE - this interface is not from the DOM specifications but from the
-html5 spec. I *think* thats right.
-
[OverrideBuiltins]
partial interface Document {
// resource metadata management
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/7604b76161b16d11a4d...
commit 7604b76161b16d11a4d70859a03a1c40d415a7ce
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
make the framebuffer resource path setting better
diff --git a/Makefile.defaults b/Makefile.defaults
index 1347956..8ee569c 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -288,9 +288,7 @@ ifeq ($(TARGET),framebuffer)
# Valid options: internal, freetype
NETSURF_FB_FONTLIB := internal
- # freetype compiled in font locations
- NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
-
+ # Default freetype font files
NETSURF_FB_FONT_SANS_SERIF := DejaVuSans.ttf
NETSURF_FB_FONT_SANS_SERIF_BOLD := DejaVuSans-Bold.ttf
NETSURF_FB_FONT_SANS_SERIF_ITALIC := DejaVuSans-Oblique.ttf
@@ -302,18 +300,19 @@ ifeq ($(TARGET),framebuffer)
NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf
NETSURF_FB_FONT_FANTASY := Impact.ttf
- # Framebuffer frontends may have differing root paths for resources
- # As such, these specify the resource path and config path.
- NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_able := (tftpboot)/
- NETSURF_FB_RESPATH_dummy := ./
- NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_x := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/
-
- NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))
+ # Default binary install path
NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
+ # Default resource install path
+ NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
+
+ # Default framebuffer search path
+ NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res
+
+ # freetype compiled in font serch path
+ NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
+
+
endif
# ----------------------------------------------------------------------------
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 37341ee..974427a 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -21,7 +21,7 @@ NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
CFLAGS += -Dnsframebuffer
#resource path
-CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"'
+CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH)"'
# compile time font locations
CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_FB_FONTPATH)"'
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index db0a9ef..e33df38 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -530,7 +530,7 @@ main(int argc, char** argv)
setbuf(stderr, NULL);
- respaths = fb_init_resource("${HOME}/.netsurf/:${NETSURFRES}:"NETSURF_FB_RESPATH":./framebuffer/res:"NETSURF_FB_FONTPATH);
+ respaths = fb_init_resource(NETSURF_FB_RESPATH":"NETSURF_FB_FONTPATH);
options = filepath_find(respaths, "Choices");
messages = filepath_find(respaths, "messages");
-----------------------------------------------------------------------
Summary of changes:
Makefile.defaults | 25 ++++++++++++-------------
atari/browser.c | 1 +
atari/browser_win.c | 1 +
atari/ctxmenu.c | 1 +
atari/global_evnt.c | 1 +
atari/gui.c | 1 +
atari/toolbar.c | 1 +
framebuffer/Makefile.target | 2 +-
framebuffer/gui.c | 2 +-
javascript/jsapi/htmldocument.c | 3 ---
10 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/Makefile.defaults b/Makefile.defaults
index 1347956..8ee569c 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -288,9 +288,7 @@ ifeq ($(TARGET),framebuffer)
# Valid options: internal, freetype
NETSURF_FB_FONTLIB := internal
- # freetype compiled in font locations
- NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
-
+ # Default freetype font files
NETSURF_FB_FONT_SANS_SERIF := DejaVuSans.ttf
NETSURF_FB_FONT_SANS_SERIF_BOLD := DejaVuSans-Bold.ttf
NETSURF_FB_FONT_SANS_SERIF_ITALIC := DejaVuSans-Oblique.ttf
@@ -302,18 +300,19 @@ ifeq ($(TARGET),framebuffer)
NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf
NETSURF_FB_FONT_FANTASY := Impact.ttf
- # Framebuffer frontends may have differing root paths for resources
- # As such, these specify the resource path and config path.
- NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_able := (tftpboot)/
- NETSURF_FB_RESPATH_dummy := ./
- NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_x := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/
-
- NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))
+ # Default binary install path
NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
+ # Default resource install path
+ NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
+
+ # Default framebuffer search path
+ NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res
+
+ # freetype compiled in font serch path
+ NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
+
+
endif
# ----------------------------------------------------------------------------
diff --git a/atari/browser.c b/atari/browser.c
index 0c043b3..f88610a 100755
--- a/atari/browser.c
+++ b/atari/browser.c
@@ -34,6 +34,7 @@
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "content/content.h"
diff --git a/atari/browser_win.c b/atari/browser_win.c
index 1babbad..9887083 100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
@@ -34,6 +34,7 @@
#include "desktop/history_core.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 2230e00..79395ca 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "content/content.h"
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
index f002f3f..1a0e8f6 100755
--- a/atari/global_evnt.c
+++ b/atari/global_evnt.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "desktop/hotlist.h"
diff --git a/atari/gui.c b/atari/gui.c
index 8142394..e500ad6 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -46,6 +46,7 @@
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "render/font.h"
#include "utils/schedule.h"
diff --git a/atari/toolbar.c b/atari/toolbar.c
index b6dc468..3594d24 100755
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -33,6 +33,7 @@
#include "desktop/history_core.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 37341ee..974427a 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -21,7 +21,7 @@ NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
CFLAGS += -Dnsframebuffer
#resource path
-CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"'
+CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH)"'
# compile time font locations
CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_FB_FONTPATH)"'
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index db0a9ef..e33df38 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -530,7 +530,7 @@ main(int argc, char** argv)
setbuf(stderr, NULL);
- respaths = fb_init_resource("${HOME}/.netsurf/:${NETSURFRES}:"NETSURF_FB_RESPATH":./framebuffer/res:"NETSURF_FB_FONTPATH);
+ respaths = fb_init_resource(NETSURF_FB_RESPATH":"NETSURF_FB_FONTPATH);
options = filepath_find(respaths, "Choices");
messages = filepath_find(respaths, "messages");
diff --git a/javascript/jsapi/htmldocument.c b/javascript/jsapi/htmldocument.c
index 1a58e4e..260f368 100644
--- a/javascript/jsapi/htmldocument.c
+++ b/javascript/jsapi/htmldocument.c
@@ -25,9 +25,6 @@
/* IDL http://www.whatwg.org/specs/web-apps/current-work/#the-document-object
-NOTE - this interface is not from the DOM specifications but from the
-html5 spec. I *think* thats right.
-
[OverrideBuiltins]
partial interface Document {
// resource metadata management
--
NetSurf Browser
10 years, 5 months
- 1
- 0
netsurf: branch master updated. 29356734eb6d537d606a5f00c040b3619d061519
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/29356734eb6d537d606a5...
...commit http://git.netsurf-browser.org/netsurf.git/commit/29356734eb6d537d606a5f0...
...tree http://git.netsurf-browser.org/netsurf.git/tree/29356734eb6d537d606a5f00c...
The branch, master has been updated
via 29356734eb6d537d606a5f00c040b3619d061519 (commit)
from 920c8b390e2c7473bf9dd1adb4daa6fce77fcd3c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/29356734eb6d537d606...
commit 29356734eb6d537d606a5f00c040b3619d061519
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Include desktop/browser_private.h.
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 4a24cb4..06e82ac 100755
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -24,7 +24,7 @@
#include "desktop/options.h"
#include "amiga/theme.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include <string.h>
#include <math.h>
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index efd1f78..2e09c99 100755
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -39,6 +39,7 @@
#include "amiga/theme.h"
#include "amiga/tree.h"
#include "amiga/utf8.h"
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/hotlist.h"
#include "desktop/selection.h"
diff --git a/amiga/file.c b/amiga/file.c
index 126c4e3..c2e4f13 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -28,7 +28,7 @@
#include "content/content.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/options.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf/pdf_plotters.h"
diff --git a/amiga/gui.c b/amiga/gui.c
index bbbb3ba..53a6aa2 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -19,6 +19,7 @@
/* NetSurf core includes */
#include "content/urldb.h"
#include "css/utils.h"
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/mouse.h"
#include "desktop/netsurf.h"
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 59e9c90..5297a4e 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -34,6 +34,7 @@
#include "amiga/gui.h"
#include "amiga/gui_options.h"
#include "utils/messages.h"
+#include "desktop/browser_private.h"
#include "desktop/options.h"
#include "amiga/utf8.h"
#include "desktop/searchweb.h"
diff --git a/amiga/history_local.c b/amiga/history_local.c
index 300363f..465d77e 100755
--- a/amiga/history_local.c
+++ b/amiga/history_local.c
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/plotters.h"
#include "amiga/os3support.h"
diff --git a/amiga/menu.c b/amiga/menu.c
index 408699e..ab8381a 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -58,7 +58,7 @@
#include "amiga/utf8.h"
#include "desktop/tree_url_node.h"
#include "desktop/hotlist.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
diff --git a/amiga/theme.c b/amiga/theme.c
index 7415d77..fce69ed 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -36,6 +36,7 @@
#include "amiga/bitmap.h"
#include "amiga/drag.h"
+#include "desktop/browser_private.h"
#include "desktop/options.h"
#include "amiga/theme.h"
#include "desktop/searchweb.h"
-----------------------------------------------------------------------
Summary of changes:
amiga/arexx.c | 2 +-
amiga/context_menu.c | 1 +
amiga/file.c | 2 +-
amiga/gui.c | 1 +
amiga/gui_options.c | 1 +
amiga/history_local.c | 1 +
amiga/menu.c | 2 +-
amiga/theme.c | 1 +
8 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 4a24cb4..06e82ac 100755
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -24,7 +24,7 @@
#include "desktop/options.h"
#include "amiga/theme.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include <string.h>
#include <math.h>
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index efd1f78..2e09c99 100755
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -39,6 +39,7 @@
#include "amiga/theme.h"
#include "amiga/tree.h"
#include "amiga/utf8.h"
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/hotlist.h"
#include "desktop/selection.h"
diff --git a/amiga/file.c b/amiga/file.c
index 126c4e3..c2e4f13 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -28,7 +28,7 @@
#include "content/content.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/options.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf/pdf_plotters.h"
diff --git a/amiga/gui.c b/amiga/gui.c
index bbbb3ba..53a6aa2 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -19,6 +19,7 @@
/* NetSurf core includes */
#include "content/urldb.h"
#include "css/utils.h"
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/mouse.h"
#include "desktop/netsurf.h"
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 59e9c90..5297a4e 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -34,6 +34,7 @@
#include "amiga/gui.h"
#include "amiga/gui_options.h"
#include "utils/messages.h"
+#include "desktop/browser_private.h"
#include "desktop/options.h"
#include "amiga/utf8.h"
#include "desktop/searchweb.h"
diff --git a/amiga/history_local.c b/amiga/history_local.c
index 300363f..465d77e 100755
--- a/amiga/history_local.c
+++ b/amiga/history_local.c
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
+#include "desktop/browser_private.h"
#include "desktop/history_core.h"
#include "desktop/plotters.h"
#include "amiga/os3support.h"
diff --git a/amiga/menu.c b/amiga/menu.c
index 408699e..ab8381a 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -58,7 +58,7 @@
#include "amiga/utf8.h"
#include "desktop/tree_url_node.h"
#include "desktop/hotlist.h"
-#include "desktop/browser.h"
+#include "desktop/browser_private.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
diff --git a/amiga/theme.c b/amiga/theme.c
index 7415d77..fce69ed 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -36,6 +36,7 @@
#include "amiga/bitmap.h"
#include "amiga/drag.h"
+#include "desktop/browser_private.h"
#include "desktop/options.h"
#include "amiga/theme.h"
#include "desktop/searchweb.h"
--
NetSurf Browser
10 years, 5 months
- 1
- 0