From 12152d253e48353254645b768c28d67e1e280a70 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Tue, 11 Dec 2012 23:06:47 +0200
Subject: Replace GUIBASE checks with equivalent OS checks

The idea is to get rid of GUIBASE and GUI checks as much as possible.

GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID

Don't set GUIBASE to these values any more in configure.ac
either.

GUIBASE_FOR_BUILD is not used anywhere.

Conflicts:
	configure.ac
	postprocess/packcomponents/makefile.mk
	postprocess/packregistry/makefile.mk

Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
---
 toolkit/Library_tk.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 7385829e8965..a7d562e58c00 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -127,13 +127,13 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/helper/vclunohelper \
 ))
 
-ifeq ($(GUIBASE),aqua)
+ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_cxxflags,tk,\
 	$(gb_OBJCXXFLAGS) \
 ))
 endif
 
-ifeq ($(GUIBASE),cocoatouch)
+ifeq ($(OS),IOS)
 $(eval $(call gb_Library_add_cxxflags,tk,\
     $(gb_OBJCXXFLAGS)))
 endif
-- 
cgit