summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Loots <ole@monochrom.net>2012-07-26 12:33:53 +0200
committerOle Loots <ole@monochrom.net>2012-07-26 12:33:53 +0200
commit483d32cadc516e2e4ba391b38a1029f9710cefe0 (patch)
treeb645973d17c98af44b2b6b162869d1f67311d869
parent93f36a8c9bd283db8f8fd1cd5c092e4e7c9ee861 (diff)
parent2b5eecb5bbb9235883e3b36d636b0d2969c5d08e (diff)
downloadnetsurf-483d32cadc516e2e4ba391b38a1029f9710cefe0.tar.gz
netsurf-483d32cadc516e2e4ba391b38a1029f9710cefe0.tar.bz2
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
-rw-r--r--Makefile.defaults21
1 files changed, 18 insertions, 3 deletions
diff --git a/Makefile.defaults b/Makefile.defaults
index 1fdb42552..134795649 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -371,10 +371,25 @@ ifeq ($(TARGET),atari)
NETSURF_USE_MNG := NO
- NETSURF_ATARI_USE_FREETYPE := YES
+ # enable true type fonts via freetype2
+ # Valid options: YES, NO
+ NETSURF_USE_ATARI_FREETYPE_FONT := YES
- # Optimisation levels
- CFLAGS += -m68000 -O2 -Wuninitialized
+ # 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 -Wuninitialized
WARNFLAGS = -W -Wundef -Wpointer-arith \
-Wcast-align -Wwrite-strings -Wstrict-prototypes \