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 /writerfilter/qa | |
| 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 'writerfilter/qa')
| -rw-r--r-- | writerfilter/qa/cppunittests/odiapi/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk index 08e11c4dbee7..fd64fcae04d8 100644 --- a/writerfilter/qa/cppunittests/odiapi/makefile.mk +++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk @@ -38,9 +38,9 @@ SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) .IF "$(GUI)"=="WNT" SHL1STDLIBS+= $(LB)$/iodiapi.lib -.ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"!="aqua" +.ELIF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX" SHL1STDLIBS+=$(LB)$/libodiapi.so -.ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"=="aqua" +.ELIF "$(OS)"=="MACOSX" SHL1STDLIBS+=$(LB)$/libodiapi.dylib .ENDIF |