summaryrefslogtreecommitdiff
path: root/scp2/util
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-11-26 18:26:02 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-11-26 18:26:02 +0000
commit3533117f779bcdb8b443bbb1ebf5135881421509 (patch)
tree4d9df953341b8e1ae97f3a58f1627e1c5109070e /scp2/util
parentab5a0125e860c3e2b417a0721c126a0e2f61818f (diff)
INTEGRATION: CWS presentationengine01 (1.7.28); FILE MERGED
2004/11/18 12:31:23 thb 1.7.28.3: #118514# Canvas reorg 2004/11/17 19:03:50 thb 1.7.28.2: RESYNC: (1.7-1.9); FILE MERGED 2004/10/04 21:18:59 thb 1.7.28.1: #110496# Added vclcanvas unconditionally also for Windows, now that we have canvasfactory fallback behaviour implemented
Diffstat (limited to 'scp2/util')
-rw-r--r--scp2/util/makefile.mk14
1 files changed, 2 insertions, 12 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 1644011d489e..4e189b940bb1 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: obo $ $Date: 2004-11-18 09:01:51 $
+# last change: $Author: rt $ $Date: 2004-11-26 19:26:02 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -186,18 +186,8 @@ SCP1FILES += \
.ENDIF
.ENDIF
-.IF "$(GUI)"=="WNT"
-.IF "$(ENABLE_DIRECTX)" != ""
-SCP1FILES += \
- directxcanvas.par
-.ELSE # IF "$(ENABLE_DIRECTX)" != ""
-SCP1FILES += \
- vclcanvas.par
-.ENDIF # IF "$(ENABLE_DIRECTX)" != ""
-.ELSE # IF "$(GUI)"=="WNT"
SCP1FILES += \
vclcanvas.par
-.ENDIF #IF "$(GUI)"=="WNT"
# --- target -------------------------------------------------------------