Make RISC OS use -O2 too and tidy comments.
svn path=/trunk/netsurf/; revision=5356
This commit is contained in:
Michael Drake
parent
7839439ce8
commit
723f48b1cc
|
|
@ -1,38 +1,39 @@
|
|||
#
|
||||
# NetSurf build configuration
|
||||
#
|
||||
# Some of these options support an 'AUTO' option, as well as YES and NO. If
|
||||
# AUTO is available, the Makefile will attempt to detect if that feature is
|
||||
# available when such is used.
|
||||
# Some of these options support an 'AUTO' option, as well as YES and NO.
|
||||
# When an option is set to AUTO, the Makefile will attempt to detect if that
|
||||
# feature is available, enabling it if possible.
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Options relating to all versions of NetSurf
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Enable NetSurf's built-in BMP support
|
||||
# Enable NetSurf's use of libnsbmp for displaying BMPs and ICOs
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_BMP := YES
|
||||
|
||||
# Enable NetSurf's built-in GIF support
|
||||
# Enable NetSurf's use of libnsgif for displaying GIFs
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_GIF := YES
|
||||
|
||||
# Enable NetSurf's use of IJG's libjpeg
|
||||
# Enable NetSurf's use of libjpeg for displaying JPEGs
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_JPEG := YES
|
||||
|
||||
# Enable NetSurf's use of libmng for displaying MNGs and PNGs
|
||||
# Enable NetSurf's use of libmng for displaying MNGs, JNGs and PNGs
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_MNG := NO
|
||||
|
||||
# Enable NetSurf's use of libpng for displaying PNGs. If MNG and PNG
|
||||
# Enable NetSurf's use of libpng for displaying PNGs. If MNG and PNG
|
||||
# are both enabled then NetSurf will choose libpng for PNGs, leaving
|
||||
# MNGs and JNGs to libmng.
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_PNG := YES
|
||||
|
||||
# Use libharu to enable PDF export and GTK printing support. There is no
|
||||
# auto-detection available for this, as it does not have a pkg-config file.
|
||||
# Enable NetSurf's use of libharu for PDF export and GTK printing support.
|
||||
# There is no auto-detection available for this, as it does not have a
|
||||
# pkg-config file.
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_HARU_PDF := YES
|
||||
|
||||
|
|
@ -45,9 +46,10 @@ NETSURF_STRIP_BINARY := NO
|
|||
# Please don't be tempted to mention Mozilla here! Let's let that lie die.
|
||||
NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; %s)"
|
||||
|
||||
# Default home page if one is not defined. Note that this does not apply to
|
||||
# the RISC OS version, as it has its own local home page, and it can be changed
|
||||
# by editing the end of gui_init2() in riscos/gui.c
|
||||
# Default home page, if one is not defined by the user. Note that this
|
||||
# option does not apply to the RISC OS version, as it has its own local
|
||||
# home page, and it can be changed by editing the end of gui_init2() in
|
||||
# riscos/gui.c
|
||||
NETSURF_HOMEPAGE := "http://www.netsurf-browser.org/welcome/"
|
||||
|
||||
# Force using glibc internal iconv implementation instead of external libiconv
|
||||
|
|
@ -62,32 +64,32 @@ CFLAGS :=
|
|||
# ----------------------------------------------------------------------------
|
||||
ifeq ($(TARGET),riscos)
|
||||
|
||||
# Enable using Hubbub to parse HTML rather than libxml2
|
||||
# Enable NetSurf's use of Hubbub to parse HTML, rather than libxml2
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_HUBBUB := YES
|
||||
|
||||
# Use James Bursa's libsvgtiny for rendering SVG images
|
||||
# Enable NetSurf's use of libsvgtiny for displaying SVGs
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_NSSVG := YES
|
||||
|
||||
# Use pencil to enable export to Drawfile
|
||||
# Enable NetSurf's use of pencil for Drawfile export
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_DRAW := YES
|
||||
|
||||
# Enable NetSurf's RISC OS Sprite support via Tinct
|
||||
# Enable NetSurf's support for displaying RISC OS Sprites
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_SPRITE := YES
|
||||
|
||||
# Enable NetSurf's ArtWorks support via AWRender
|
||||
# Enable NetSurf's use of AWRender for displaying ArtWorks files
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_ARTWORKS := YES
|
||||
|
||||
# Enable support for the Acorn plugin protocol
|
||||
# Enable NetSurf's support for the Acorn plugin protocol
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_PLUGINS := NO
|
||||
|
||||
# Optimisation levels
|
||||
CFLAGS += -O -Wuninitialized
|
||||
CFLAGS += -O2 -Wuninitialized
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -103,15 +105,15 @@ ifeq ($(TARGET),gtk)
|
|||
# Where to install the netsurf binary
|
||||
NETSURF_GTK_BIN := /usr/local/bin/
|
||||
|
||||
# Enable using Hubbub to parse HTML rather than libxml2
|
||||
# Enable NetSurf's use of Hubbub to parse HTML, rather than libxml2
|
||||
# Valid options: YES, NO, AUTO
|
||||
NETSURF_USE_HUBBUB := AUTO
|
||||
|
||||
# Use librsvg in conjunction with Cairo to render SVG images
|
||||
# Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
|
||||
# Valid options: YES, NO, AUTO
|
||||
NETSURF_USE_RSVG := AUTO
|
||||
|
||||
# Use James Shaw's librosprite for rendering RISC OS Sprites
|
||||
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
|
||||
# Valid options: YES, NO, AUTO
|
||||
NETSURF_USE_ROSPRITE := AUTO
|
||||
|
||||
|
|
@ -131,11 +133,11 @@ endif
|
|||
# ----------------------------------------------------------------------------
|
||||
ifeq ($(TARGET),beos)
|
||||
|
||||
# Use James Shaw's librosprite for rendering RISC OS Sprites
|
||||
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
|
||||
# Valid options: YES, NO, AUTO
|
||||
NETSURF_USE_ROSPRITE := AUTO
|
||||
|
||||
# Use libharu to enable PDF export and GTK printing support.
|
||||
# Enable NetSurf's use of libharu for PDF export.
|
||||
# Valid options: YES, NO
|
||||
NETSURF_USE_HARU_PDF := NO
|
||||
|
||||
|
|
@ -153,7 +155,7 @@ endif
|
|||
# ----------------------------------------------------------------------------
|
||||
ifeq ($(TARGET),amiga)
|
||||
|
||||
# Use James Shaw's librosprite for rendering RISC OS Sprites
|
||||
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
|
||||
# Valid options: YES, NO, AUTO
|
||||
NETSURF_USE_ROSPRITE := YES
|
||||
|
||||
|
|
@ -161,7 +163,7 @@ ifeq ($(TARGET),amiga)
|
|||
# Valid options: YES, NO
|
||||
NETSURF_USE_MNG := YES
|
||||
|
||||
# Enable using Hubbub to parse HTML rather than libxml2
|
||||
# Enable NetSurf's use of Hubbub to parse HTML rather, than libxml2
|
||||
# Valid options: YES, NO, AUTO
|
||||
NETSURF_USE_HUBBUB := YES
|
||||
|
||||
|
|
@ -174,8 +176,10 @@ endif
|
|||
# Debug-target-specific options
|
||||
# ----------------------------------------------------------------------------
|
||||
ifeq ($(TARGET),debug)
|
||||
|
||||
# Optimisation levels
|
||||
CFLAGS += -O0
|
||||
|
||||
endif
|
||||
|
||||
# Include any local overrides
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Makefile for NetSurf
|
||||
# NetSurf source file inclusion
|
||||
#
|
||||
# Included by main makefile -- indicates sources
|
||||
# for each build.
|
||||
|
|
|
|||
Loading…
Reference in New Issue