diff options
| author | Ole Loots <ole@monochrom.net> | 2012-12-18 01:28:22 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2012-12-18 01:28:22 +0100 |
| commit | 3019368c93600a335445c09178c9554074c7f656 (patch) | |
| tree | 872c3bcbba0b74584cda24bee36ffe784806108f /atari | |
| parent | c6a5109a95c1206ccf63d99316fa12b8c43bb7cf (diff) | |
| parent | 0d803b6c0d252c3a1a9fa07e37d9a0b08ce567b8 (diff) | |
| download | netsurf-3019368c93600a335445c09178c9554074c7f656.tar.gz netsurf-3019368c93600a335445c09178c9554074c7f656.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependency
Diffstat (limited to 'atari')
| -rw-r--r-- | atari/Makefile.defaults | 52 | ||||
| -rw-r--r-- | atari/Makefile.target | 4 |
2 files changed, 54 insertions, 2 deletions
diff --git a/atari/Makefile.defaults b/atari/Makefile.defaults new file mode 100644 index 000000000..150358843 --- /dev/null +++ b/atari/Makefile.defaults @@ -0,0 +1,52 @@ +# ---------------------------------------------------------------------------- +# Atari-specific options +# ---------------------------------------------------------------------------- + + # Force using glibc internal iconv implementation instead of external libiconv + # Valid options: YES, NO + NETSURF_USE_LIBICONV_PLUG := NO + + # Enable NetSurf's use of librosprite for displaying RISC OS Sprites + # Valid options: YES, NO, AUTO + NETSURF_USE_ROSPRITE := NO + + # Enable NetSurf's use of libwebp for displaying WebPs + # Valid options: YES, NO + NETSURF_USE_WEBP := NO + + # Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs + # Valid options: YES, NO, AUTO + NETSURF_USE_RSVG := AUTO + + # Enable NetSurf's use of libsvgtiny for displaying SVGs + # Valid options: YES, NO, AUTO + NETSURF_USE_NSSVG := AUTO + + NETSURF_USE_MNG := NO + + # enable true type fonts via freetype2 + # Valid options: YES, NO + NETSURF_USE_ATARI_FREETYPE_FONT := YES + + # Enable use of netsurf embedded font + # Valid options: YES, NO + NETSURF_USE_ATARI_NETSURF_FONT := YES + + # Configure support for screen drivers with no true colour mode + # Valid options: YES, NO + NETSURF_USE_ATARI_8BPP_SUPPORT := NO + + # Configure the CPU target + # Valid options: 68000, 68020-60, 5475 (coldfire) + ATARI_ARCH = 68020-60 + + # enable optimizations + # -O2 is currently broken with m68000 / m68020-60 builds + CFLAGS += -O1 + + # override warning flags removing -Wall + WARNFLAGS = -W -Wundef -Wpointer-arith \ + -Wcast-align -Wwrite-strings -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \ + -Wnested-externs -Wuninitialized -Wl,-t + diff --git a/atari/Makefile.target b/atari/Makefile.target index 849451873..e7755d56f 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -55,8 +55,8 @@ NETSURF_USE_JS:=YES NETSURF_USE_MOZJS:=YES endif -$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF)) +$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) +$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) CFLAGS += -U__STRICT_ANSI__ -std=c99 -I. -Dsmall $(WARNFLAGS) -Dnsatari \ -D_BSD_SOURCE \ |