From a8d4242cd75b1326f2cbcbedb7f21d9cc2618cb4 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 3 Apr 2008 16:07:21 +0000 Subject: INTEGRATION: CWS vcl87 (1.29.16); FILE MERGED 2008/04/01 10:31:13 pl 1.29.16.3: #i76650# seems solaris 10 has a botched libXrandr 2008/03/12 09:39:51 pl 1.29.16.2: RESYNC: (1.29-1.30); FILE MERGED 2008/03/07 16:46:28 pl 1.29.16.1: #i76650# RandR support for screen size changes --- vcl/unx/source/app/makefile.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'vcl') diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk index 57ec28a33e9c..8f16da9343de 100644 --- a/vcl/unx/source/app/makefile.mk +++ b/vcl/unx/source/app/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.31 $ # -# last change: $Author: kz $ $Date: 2008-03-07 17:12:23 $ +# last change: $Author: kz $ $Date: 2008-04-03 17:07:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -64,6 +64,7 @@ SLOFILES=\ $(SLO)$/saldata.obj \ $(SLO)$/saltimer.obj \ $(SLO)$/saldisp.obj \ + $(SLO)$/randrwrapper.obj \ $(SLO)$/salinst.obj \ $(SLO)$/salsys.obj \ $(SLO)$/soicon.obj \ @@ -81,6 +82,12 @@ EXCEPTIONSFILES=\ $(SLO)$/salsys.obj +.IF "$(ENABLE_RANDR)" != "" +.IF "$(OS)" != "SOLARIS" +CDEFS+=-DUSE_RANDR +.ENDIF +.ENDIF + .IF "$(USE_XINERAMA)" != "NO" CDEFS+=-DUSE_XINERAMA .IF "$(USE_XINERAMA_VERSION)" == "Xorg" -- cgit