diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.sources | 2 | ||||
| -rwxr-xr-x | amiga/dist/Install | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -516,13 +516,15 @@ ifeq ($(TARGET),amiga) $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng))) - CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I SDK:local/common/include/libpng12 -Dnsamiga + CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga LDFLAGS += -lxml2 -ldl -lcurl -lpthread -lregex -lauto LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES) - CFLAGS += -DNS_AMIGA_CAIRO -I SDK:local/common/include/cairo + CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo LDFLAGS += -use-dynld -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat + SUBTARGET := -cairo + EXETARGET := NetSurf_Cairo endif endif diff --git a/Makefile.sources b/Makefile.sources index 4b8c0ff18..851d89575 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -162,7 +162,7 @@ endif ifeq ($(TARGET),amiga) SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF) -EXETARGET := NetSurf +EXETARGET := NetSurf$(SUBTARGET) endif ifeq ($(TARGET),framebuffer) diff --git a/amiga/dist/Install b/amiga/dist/Install index dcde3c6a2..b8afc8d1d 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -354,7 +354,7 @@ (complete 20) -(set #netsurf-name (select #cairo-version "NetSurf" "NetSurf_Cairo")) +(set #netsurf-name (select #cairo-version "NetSurf" "NetSurf-Cairo")) (if (= #AutoInstall 0) ( |