diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-21 07:48:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-21 07:55:52 +0300 |
| commit | 660931e2968a038d18393a9647403e2a53236190 (patch) | |
| tree | 33dd1e924b82be6e5f0a7d4cf30d501b66843ee2 /canvas | |
| parent | b0a77d0b6e97cb0e4d93a657a788a3ee7dee0d77 (diff) | |
Build the cairo canvas also for Windows if we don't build the DirectX one
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/prj/build.lst | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/makefile.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst index 4719f157dfca..dad6e28c0ea5 100644 --- a/canvas/prj/build.lst +++ b/canvas/prj/build.lst @@ -4,7 +4,7 @@ cv canvas\inc nmake - all cv_inc NULL cv canvas\source\tools nmake - all cv_tools cv_inc NULL cv canvas\source\vcl nmake - all cv_vcl cv_tools cv_inc NULL cv canvas\source\simplecanvas nmake - all cv_simplecanvas cv_tools cv_inc NULL -cv canvas\source\cairo nmake - u cv_cairo cv_tools cv_inc NULL +cv canvas\source\cairo nmake - all cv_cairo cv_tools cv_inc NULL cv canvas\source\directx nmake - w cv_directx cv_tools cv_inc NULL cv canvas\source\null nmake - all cv_null cv_tools cv_inc NULL cv canvas\source\factory nmake - all cv_factory cv_inc NULL 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 ---------------------------------------------------------- |