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

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 -------------------------------------------------------------