[Libreoffice-commits] .: 2 commits - canvas/prj canvas/source

[Tor Lillqvist]

 canvas/prj/build.lst            |    2 +-
 canvas/source/cairo/makefile.mk |    7 +++++++
 canvas/source/tools/makefile.mk |    4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 6a9703bbd3ef8d22fd10bb79aa36446e9772c8ac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 21 07:49:27 2011 +0300

    Generate import library that matches libs.mk for WNTGCC

diff --git a/canvas/source/tools/makefile.mk b/canvas/source/tools/makefile.mk
index ab4f545..3169ead 100644
--- a/canvas/source/tools/makefile.mk
+++ b/canvas/source/tools/makefile.mk
@@ -62,7 +62,11 @@ SLOFILES =	\
     $(SLO)$/verifyinput.obj
 
 SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= 	i$(TARGET)
+.ELSE
+SHL1IMPLIB= 	$(TARGET)$(DLLPOSTFIX)
+.ENDIF
 SHL1STDLIBS=	$(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB)
 
 SHL1LIBS=		$(SLB)$/$(TARGET).lib
commit 89c4276a411a8e8bd1e9c9a69c770d88897ce70c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 21 07:48:52 2011 +0300

    Build the cairo canvas also for Windows if we don't build the DirectX one

diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst
index 4719f15..dad6e28 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 59d1512..cbcfbe1 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)" != ""
+ at all:
+    @echo "Building with the DirectX canvas so not bothering with the cairo one..."
+.ENDIF
+
+
 # --- Common ----------------------------------------------------------