mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build Cairo version as NetSurf; non-Cairo version as NetSurf-Static 

Don't bother to build/copy NetSurf-Static for release packages
Update .readme to show requirement for AmigaOS 4.1

svn path=/trunk/netsurf/; revision=12893
This commit is contained in:
Chris Young 2011-09-26 21:41:33 +00:00
parent 9992ee9119
commit ad3af34742
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
amiga/Makefile.target
View File

@ -33,9 +33,9 @@ ifeq ($(HOST),amiga)
ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
EXETARGET := NetSurf-Cairo
else
EXETARGET := NetSurf
else
EXETARGET := NetSurf-Static
endif
else
$(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))

6
amiga/dist/Install vendored
View File

@ -306,7 +306,7 @@
(set osver (/ osver 65536))
(set #versions-available 0)
(if (exists "NetSurf")
(if (exists "NetSurf-Static")
(
(set #static-name "Static/graphics.library")
(set #versions-available (+ #versions-available 1))
@ -317,7 +317,7 @@
)
)
(if (AND (>= osver 53) (exists "NetSurf-Cairo"))
(if (AND (>= osver 53) (exists "NetSurf"))
(
(set #cairo-name "Shared objects/part-Cairo")
(set #versions-available (+ #versions-available 1))
@ -406,7 +406,7 @@
(complete 20)
(set #netsurf-name (select #cairo-version "NetSurf" "NetSurf-Cairo"))
(set #netsurf-name (select #cairo-version "NetSurf-Static" "NetSurf"))
(if (= #AutoInstall 0)
(

2
amiga/dist/netsurf.readme vendored
View File

@ -3,7 +3,7 @@ Uploader: chris@unsatisfactorysoftware.co.uk (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
Version: 3.0 development (SVN 10866)
Architecture: ppc-amigaos >= 4.0.0
Architecture: ppc-amigaos >= 4.1.0
Install manually with Installer script only -
INTENTIONALLY NOT AVAILABLE VIA AMIUPDATE

2
amiga/pkg/makepackage
View File

@ -14,7 +14,7 @@ delete ram:netsurf/resources/#?.user
copy resources/Pointers/~(.svn) ram:NetSurf/Resources/Pointers
copy (COPYING|ChangeLog) ram:NetSurf/
copy NetSurf ram:NetSurf/NetSurf
copy NetSurf-Cairo ram:NetSurf/NetSurf-Cairo
;copy NetSurf-Static ram:NetSurf/NetSurf-Cairo
copy amiga/dist/AutoInstall ram:
copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/
copy amiga/pkg/drawer.info ram:NetSurf.info