summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/Makefile.target11
-rwxr-xr-xamiga/dist/Install31
-rwxr-xr-xamiga/gui.c12
-rwxr-xr-xamiga/menu.c4
-rwxr-xr-xamiga/menu.h5
5 files changed, 26 insertions, 37 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 61de77b36..4cd76cf30 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -39,9 +39,6 @@ ifeq ($(HOST),amiga)
ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES)
CFLAGS += -I /SDK/local/common/include/cairo
LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
- EXETARGET := NetSurf
- else
- EXETARGET := NetSurf-Static
endif
else
$(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
@@ -66,18 +63,14 @@ else
else
LDFLAGS += -lauto -lpbl -liconv
endif
-
- ifeq ($(NETSURF_AMIGA_CAIRO_AVAILABLE),yes)
- EXETARGET := NetSurf
- else
- EXETARGET := NetSurf-Static
- endif
endif
ifeq ($(NETSURF_USE_MOZJS),YES)
NETSURF_USE_JS:=YES
endif
+EXETARGET := NetSurf
+
# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
diff --git a/amiga/dist/Install b/amiga/dist/Install
index 039ccbf40..7b8c5fe0b 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -311,20 +311,9 @@
(set osver (/ osver 65536))
(set #versions-available 0)
-(set #static-filename "NetSurf-Static")
+(set #static-filename "NetSurf")
(set #cairo-filename "NetSurf")
-(if (exists "NetSurf-Static")
- (
- (set #static-name "Static/graphics.library")
- (set #versions-available (+ #versions-available 1))
- )
- ; else
- (
- (set #static-name "")
- )
-)
-
(if (exists "NetSurf")
(
(if (exists "SObjs")
@@ -375,8 +364,7 @@
(set #cairo-version
(askchoice
(prompt "Which version of NetSurf would you like to install?")
- (help "The Cairo/shared objects version has better rendering "
- "of some graphical elements, and supports SVG.\n\n"
+ (help "The Cairo version has anti-aliasing of graphical elements.\n\n"
@askchoice-help)
(choices #static-name #cairo-name)
(default #cairo-version)
@@ -460,6 +448,8 @@
(set #netsurf-name (select #cairo-version #static-filename #cairo-filename))
+(working "Installing NetSurf")
+
(if (= #AutoInstall 0)
(
(copyfiles
@@ -474,18 +464,7 @@
)
;else
(
- (copyfiles
- (prompt "Please check the version of NetSurf you are copying against "
- "any which might already be installed.")
- (help @copyfiles-help)
- (source #netsurf-name)
- (dest "T:")
- (newname "NetSurf")
- (optional "force" "oknodelete")
- )
-
- (run "CopyStore T:NetSurf" @default-dest)
- (delete "T:NetSurf")
+ (run "CopyStore NetSurf" @default-dest)
)
)
diff --git a/amiga/gui.c b/amiga/gui.c
index 15ac1f553..37f054776 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1927,6 +1927,16 @@ void ami_handle_msg(void)
ami_update_throbber(gwin, true);
refresh_throbber = FALSE;
}
+
+ if(ami_menu_window_close)
+ {
+ if(ami_menu_window_close == AMI_MENU_WINDOW_CLOSE_ALL)
+ ami_quit_netsurf();
+ else
+ ami_close_all_tabs(ami_menu_window_close);
+
+ ami_menu_window_close = NULL;
+ }
}
void ami_gui_appicon_remove(struct gui_window_2 *gwin)
@@ -2276,6 +2286,8 @@ void ami_quit_netsurf(void)
}
} while(node = nnode);
+
+ win_destroyed = true;
}
if(IsMinListEmpty(window_list))
diff --git a/amiga/menu.c b/amiga/menu.c
index ab8381a44..b116e1b39 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -676,7 +676,7 @@ static void ami_menu_item_project_closewin(struct Hook *hook, APTR window, struc
struct gui_window_2 *gwin;
GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin);
- ami_close_all_tabs(gwin);
+ ami_menu_window_close = gwin;
}
static void ami_menu_item_project_print(struct Hook *hook, APTR window, struct IntuiMessage *msg)
@@ -736,7 +736,7 @@ static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct I
static void ami_menu_item_project_quit(struct Hook *hook, APTR window, struct IntuiMessage *msg)
{
- ami_quit_netsurf();
+ ami_menu_window_close = AMI_MENU_WINDOW_CLOSE_ALL;
}
static void ami_menu_item_edit_cut(struct Hook *hook, APTR window, struct IntuiMessage *msg)
diff --git a/amiga/menu.h b/amiga/menu.h
index 36c601792..d692320a3 100755
--- a/amiga/menu.h
+++ b/amiga/menu.h
@@ -63,9 +63,14 @@
#define AMI_MENU_CLEAR FULLMENUNUM(1,5,0)
#define AMI_MENU_FIND FULLMENUNUM(2,0,0)
+/* A special value for ami_menu_window_close */
+#define AMI_MENU_WINDOW_CLOSE_ALL 1
+
struct gui_window;
struct gui_window_2;
+struct gui_window_2 *ami_menu_window_close;
+
void ami_free_menulabs(struct gui_window_2 *gwin);
struct NewMenu *ami_create_menu(struct gui_window_2 *gwin);
void ami_menu_refresh(struct gui_window_2 *gwin);