[Libreoffice-commits] .: solenv/inc

Jesús Corrius jcorrius at kemper.freedesktop.org
Thu Jun 23 04:05:53 PDT 2011


 solenv/inc/pstrules.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3e398c6a0cb528142c1addcfa739da1eaf868eaf
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Thu Jun 23 13:05:25 2011 +0200

    Fix for mingw32 crosscompilation

diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 9dd6cc1..1669a25 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -135,7 +135,11 @@ $(PAR)/%.par :
     @echo "Making:   " $@
     @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
 .IF "$(GUI)"=="WNT"
+.IF "$(CROSS_COMPILING)" == "NO"
     $(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
+.ELSE
+    $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I#$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
+.ENDIF
 .ENDIF
 # YD: INCLUDE macro too long, include only few items (scp2 compile)
 .IF "$(GUI)"=="UNX"


More information about the Libreoffice-commits mailing list