summaryrefslogtreecommitdiff
path: root/canvas/source
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-21 07:48:52 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-21 07:55:52 +0300
commit660931e2968a038d18393a9647403e2a53236190 (patch)
tree33dd1e924b82be6e5f0a7d4cf30d501b66843ee2 /canvas/source
parentb0a77d0b6e97cb0e4d93a657a788a3ee7dee0d77 (diff)
Build the cairo canvas also for Windows if we don't build the DirectX one
Diffstat (limited to 'canvas/source')
-rw-r--r--canvas/source/cairo/makefile.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk
index 59d1512701a7..cbcfbe1aa710 100644
--- a/canvas/source/cairo/makefile.mk
+++ b/canvas/source/cairo/makefile.mk
@@ -47,6 +47,13 @@ DLLPRE =
@echo "Cannot build cairocanvas without cairo..."
.ENDIF
+# --- Don't build for Windows unless we're compiling with --disable-directx -----------
+.IF "$(GUI)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
+@all:
+ @echo "Building with the DirectX canvas so not bothering with the cairo one..."
+.ENDIF
+
+
# --- Common ----------------------------------------------------------