diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-11 23:06:47 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-18 20:52:24 -0500 |
| commit | 12152d253e48353254645b768c28d67e1e280a70 (patch) | |
| tree | e03c55911e16ec73056a21795411fa5081f71bd2 /vcl | |
| parent | 3b87d3dd507cd48286160e62383f48e2f70f0067 (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 8 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index af314880a29b..3550beb6c9bb 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -32,7 +32,7 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx)) else ifeq ($(OS),WNT) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows)) -else ifeq ($(GUIBASE),android) +else ifeq ($(OS),ANDROID) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android)) else ifeq ($(OS),IOS) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios)) @@ -324,7 +324,7 @@ $(eval $(call gb_Library_use_packages,vcl,\ # GUIBASE specific stuff -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ @@ -530,7 +530,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(GUIBASE),android) +ifeq ($(OS),ANDROID) $(eval $(call gb_Library_add_libs,vcl,\ -llog \ -landroid \ @@ -561,7 +561,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(GUIBASE),cocoatouch) +ifeq ($(OS),IOS) $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ )) diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 38c730db7cff..362acb3560c4 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -70,13 +70,13 @@ $(eval $(call gb_Module_add_targets,vcl,\ endif endif -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,vcl,\ Zip_osxres \ )) endif -ifeq ($(GUIBASE),WIN) +ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,vcl,\ WinResTarget_vcl \ )) |