From c32a645954dba0f6a6185017a158cd84066c719c Mon Sep 17 00:00:00 2001 From: Alexander Kojevnikov Date: Fri, 18 Mar 2011 15:49:11 +0800 Subject: [PATCH] Remove HOST_OS We can now detect the OS at compile time. --- configure.ac | 8 -------- src/spek-spectrogram.vala | 6 +++--- vapi/config.vapi | 3 --- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index cf07212..73c3d11 100644 --- a/configure.ac +++ b/configure.ac @@ -3,14 +3,6 @@ AC_INIT([spek],[0.6]) AC_CONFIG_SRCDIR([src/spek.vala]) AC_CONFIG_HEADERS([config.h]) - -# Determine the system type. -AC_CANONICAL_HOST -AC_SUBST(host_os) -AC_DEFINE_UNQUOTED(HOST_OS, "$host_os", - [Define the canonical host OS type.] -) - AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2]) # Enable silent rules is available diff --git a/src/spek-spectrogram.vala b/src/spek-spectrogram.vala index 3e43c5d..5fc004c 100644 --- a/src/spek-spectrogram.vala +++ b/src/spek-spectrogram.vala @@ -43,10 +43,10 @@ namespace Spek { private double FONT_SCALE = 1.0; public Spectrogram () { +#if G_OS_DARWIN // Pango/Quartz fonts are smaller than on X. - if (Config.HOST_OS.down ().has_prefix ("darwin")) { - FONT_SCALE = 1.4; - } + FONT_SCALE = 1.4; +#endif // Pre-draw the palette. palette = new ImageSurface (Format.RGB24, RULER, BANDS); diff --git a/vapi/config.vapi b/vapi/config.vapi index 601bbf0..7cc4968 100644 --- a/vapi/config.vapi +++ b/vapi/config.vapi @@ -13,7 +13,4 @@ namespace Config { public const string LOCALEDIR; /* /usr/local/share/locale */ public const string PKGDATADIR; /* /usr/local/share/spek */ public const string PKGLIBDIR; /* /usr/local/lib/spek */ - - /* freebsd*, linux*, mingw*, darwin*, etc. */ - public const string HOST_OS; }