diff options
| -rw-r--r-- | amiga/Makefile.target | 10 | ||||
| -rwxr-xr-x | amiga/dist/Install | 50 | ||||
| -rw-r--r-- | amiga/dist/Install.info | bin | 8892 -> 8892 bytes | |||
| -rw-r--r-- | amiga/dist/NetSurf.guide.info | bin | 6741 -> 6741 bytes | |||
| -rw-r--r-- | amiga/dist/Rexx.info | bin | 6206 -> 6206 bytes | |||
| -rw-r--r-- | amiga/dist/netsurf.readme.info | bin | 6238 -> 6238 bytes | |||
| -rw-r--r-- | amiga/pkg/drawer.info | bin | 17208 -> 17208 bytes |
7 files changed, 49 insertions, 11 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 2a821ba25..c8046b4f0 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -101,6 +101,10 @@ 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 AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES)) +AMIGA_LIBRARIES := parserutils.library nsgif.library nsbmp.library iconv.library hubbub.library +AMIGA_LIBS := $(addprefix /Libs/,$(AMIGA_LIBRARIES)) +AMIGA_SHARED_OBJS := libjpeg.so.8 libxml2.so.9 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0 libwapcaplet.so.0 libpng12.so libdom.so.0 libhubbub.so.0 +AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS)) AMIGA_DISTRIBUTION_FILES := amiga/dist/* AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga @@ -120,6 +124,12 @@ netsurf.lha: NetSurf $(Q)cp amiga/pkg/fitr $(AMIGA_INSTALL_TARGET_DIR)/NetSurf $(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info $(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR) + ifeq ($(HOST),amiga) + $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs + $(Q)cp $(AMIGA_LIBS) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Libs + $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs + $(Q)cp --preserve=timestamps $(AMIGA_SOBJS) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs + endif $(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \ lha a netsurf.lha NetSurf NetSurf.info AutoInstall diff --git a/amiga/dist/Install b/amiga/dist/Install index c3d5af2f1..e794939fe 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -283,7 +283,7 @@ (if (= @default-dest "") ( ; Workaround for Installer bug picking TEXTCLIP: as a sensible location - (if (= @default-dest "TextClip:") (set @default-dest "SYS:Utilities")) + (if (= @default-dest "TextClip:") (set @default-dest "SYS:Internet")) (if (= @user-level 0) ( @@ -297,7 +297,7 @@ (set @default-dest (askdir (prompt "Where would you like to install NetSurf?\n" - "(a drawer will not be created)") + "(a drawer WILL NOT be created)") (help @askdir-help) (default @default-dest) ) @@ -311,6 +311,9 @@ (set osver (/ osver 65536)) (set #versions-available 0) +(set #static-filename "NetSurf-Static") +(set #cairo-filename "NetSurf") + (if (exists "NetSurf-Static") ( (set #static-name "Static/graphics.library") @@ -322,11 +325,32 @@ ) ) -(if (AND (>= osver 53) (exists "NetSurf")) +(if (exists "NetSurf") ( - (set #cairo-name "Shared objects/part-Cairo") - (set #versions-available (+ #versions-available 1)) - (set #cairo-version 1) + (if (exists "SObjs") + ( + (if (>= osver 53) + ( + (set #cairo-name "Shared objects/part-Cairo") + (set #versions-available (+ #versions-available 1)) + (set #cairo-version 1) + ) + ;else + ( + (set #cairo-version 0) + (set #cairo-name "") + ) + ) + ) + ;else + ( + ; assume static if sobjs is not present + (set #static-name "Static/graphics.library") + (set #versions-available (+ #versions-available 1)) + (set #cairo-version 0) + (set #static-filename "NetSurf") + ) + ) ) ; else ( @@ -421,7 +445,7 @@ (complete 20) -(set #netsurf-name (select #cairo-version "NetSurf-Static" "NetSurf")) +(set #netsurf-name (select #cairo-version #static-filename #cairo-filename)) (if (= #AutoInstall 0) ( @@ -482,10 +506,14 @@ (set #complete 40) (working "Copying Libraries") -(foreach "Libs" "#?" - (complete #complete) - (p_copylib @each-name) - (set #complete (+ #complete 2)) +(if (exists "Libs") + ( + (foreach "Libs" "#?" + (complete #complete) + (p_copylib @each-name) + (set #complete (+ #complete 2)) + ) + ) ) (set #complete 60) diff --git a/amiga/dist/Install.info b/amiga/dist/Install.info Binary files differindex 477ee2e4f..944fcc69d 100644 --- a/amiga/dist/Install.info +++ b/amiga/dist/Install.info diff --git a/amiga/dist/NetSurf.guide.info b/amiga/dist/NetSurf.guide.info Binary files differindex fedb27fa7..d6d529d31 100644 --- a/amiga/dist/NetSurf.guide.info +++ b/amiga/dist/NetSurf.guide.info diff --git a/amiga/dist/Rexx.info b/amiga/dist/Rexx.info Binary files differindex 2cb135722..908b01843 100644 --- a/amiga/dist/Rexx.info +++ b/amiga/dist/Rexx.info diff --git a/amiga/dist/netsurf.readme.info b/amiga/dist/netsurf.readme.info Binary files differindex d6fb397f2..c0ee5ff44 100644 --- a/amiga/dist/netsurf.readme.info +++ b/amiga/dist/netsurf.readme.info diff --git a/amiga/pkg/drawer.info b/amiga/pkg/drawer.info Binary files differindex 4b41433f0..0a9548a0d 100644 --- a/amiga/pkg/drawer.info +++ b/amiga/pkg/drawer.info |