summaryrefslogtreecommitdiff
path: root/cli_ure
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-07-17 10:46:30 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-07-17 10:46:30 +0000
commit74917f9d489073657f045a6e304caeb0f079a155 (patch)
treed0804ac777cf5d7aa4cff29c6d657791a0b2613c /cli_ure
parent2e2af274ba66e44538742e6a0cb28218049bde4a (diff)
INTEGRATION: CWS jl106 (1.25.4); FILE MERGED
2008/07/02 13:55:03 jl 1.25.4.2: #i80475# added comment 2008/07/02 12:57:00 jl 1.25.4.1: #91168# dmake error when building with mingw
Diffstat (limited to 'cli_ure')
-rw-r--r--cli_ure/source/native/makefile.mk14
1 files changed, 11 insertions, 3 deletions
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 4258f2990366..db27cc02fc45 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -7,7 +7,7 @@
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $
-# $Revision: 1.25 $
+# $Revision: 1.26 $
#
# This file is part of OpenOffice.org.
#
@@ -54,7 +54,11 @@ ECHOQUOTE='
ECHOQUOTE=
.ENDIF
-.IF "$(BUILD_FOR_CLI)" != ""
+
+.IF "$(BUILD_FOR_CLI)" == ""
+#do not even build the cxx files because they contain cli cpp
+all:
+.ELSE
.INCLUDE : $(BIN)$/cliureversion.mk
@@ -122,7 +126,6 @@ SHL1VERSIONMAP = msvc.map
SHL1DEF = $(MISC)$/$(SHL1TARGET).def
DEF1NAME = $(SHL1TARGET)
-.ENDIF # "$(BUILD_FOR_CLI)" != ""
.INCLUDE : $(PRJ)$/util$/target.pmk
.INCLUDE : target.mk
@@ -162,6 +165,10 @@ $(SIGN): $(SHL1TARGETN)
#do not forget to deliver cli_cppuhelper.config. It is NOT embedded in the policy file.
.IF "$(CCNUMVER)" >= "001399999999"
#.NET 2 and higher
+# If the x86 switch is ommitted then the system assumes the assembly to be MSIL.
+# The policy file is still found when an application tries to load an older
+# cli_cppuhelper.dll but the system cannot locate it. It possibly assumes that the
+# assembly is also 'MSIL' like its policy file.
$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
$(WRAPCMD) AL.exe -out:$@ \
-version:$(CLI_CPPUHELPER_POLICY_VERSION) \
@@ -182,3 +189,4 @@ $(BIN)$/cli_cppuhelper.config: cli_cppuhelper_config $(BIN)$/cliureversion.mk
$(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
$< $@
+.ENDIF # "$(BUILD_FOR_CLI)" != ""