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 /cairo | |
| 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 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 4 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index e5d0b941900e..5e40c8cfd777 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -109,8 +109,8 @@ BUILD_DIR= OUT2INC+=src$/cairo-win32.h -.ELIF "$(GUIBASE)"=="aqua" -# ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +.ELIF "$(OS)"=="MACOSX" +# ----------- Mac OS X -------------------------------- .IF "$(SYSBASE)"!="" .IF "$(EXTRA_CFLAGS)" != "" cairo_CFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 316d2d60af2f..10ba0f56789c 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -77,8 +77,8 @@ BUILD_DIR=pixman BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release .ENDIF -.ELIF "$(GUIBASE)"=="aqua" -# ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +.ELIF "$(OS)"=="MACOSX" +# ----------- Mac OS X -------------------------------- CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)" |