[mono] Make cli_ure build on windows again

Change-Id: I4b79502121f9cb1577214a2c22ffa20bb599e419

6 files changed, 22 insertions, 7 deletions

diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index f9560449c895..7448a708d855 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -11,5 +11,5 @@ ure	cli_ure\source\ure                      nmake   -       all     ure_source_u
 ure cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
 ure	cli_ure\source\mono_bridge	nmake	-	u		ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
 ure	cli_ure\source\mono_loader      nmake   -       u       ure_source_mono_loader ure_unotypes ure_source_ure ure_inc NULL
-ure cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
+ure cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge.w ure_inc NULL
 #ure cli_ure\util				nmake	-	w,vc7	ure_util ure_source_ure ure_source_native NULL
diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk
index e24b6fbc8ac2..1fe21adb16b5 100644
--- a/cli_ure/source/basetypes/makefile.mk
+++ b/cli_ure/source/basetypes/makefile.mk
@@ -91,7 +91,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_basetypes.config
     $(WRAPCMD) $(AL) -out:$@ \
             -version:$(CLI_BASETYPES_POLICY_VERSION) \
             -keyfile:$(BIN)$/cliuno.snk \
-            -link:cli_basetypes.config,$(BIN)$/cli_basetypes.config
+            -link:$(CLI_BASETYPES_CONFIG)
 
 
 #Create the config file that is used with the policy assembly
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 8d4128350075..367e2704c117 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -150,7 +150,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
     $(WRAPCMD) $(AL) -out:$@ \
             -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
             -keyfile:$(BIN)$/cliuno.snk \
-            -link:cli_cppuhelper.config,$(BIN)$/cli_cppuhelper.config \
+            -link:$(BIN)$/cli_cppuhelper.config \
             -platform:x86
 
 #Create the config file that is used with the policy assembly
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
index 175256baf885..b394e8bf3e37 100644
--- a/cli_ure/source/ure/makefile.mk
+++ b/cli_ure/source/ure/makefile.mk
@@ -99,7 +99,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ure.config
     $(WRAPCMD) $(AL) -out:$@ \
             -version:$(CLI_URE_POLICY_VERSION) \
             -keyfile:$(BIN)$/cliuno.snk \
-            -link:cli_ure.config,$(BIN)$/cli_ure.config
+            -link:$(CLI_URE_CONFIG)
 
 #Create the config file that is used with the policy assembly
 $(BIN)$/cli_ure.config: cli_ure_config $(BIN)$/cliureversion.mk 
diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk
index 546583ca0acb..e278de4a4575 100644
--- a/cli_ure/unotypes/makefile.mk
+++ b/cli_ure/unotypes/makefile.mk
@@ -43,7 +43,8 @@ TARGET = unotypes
 WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(OUT)/lib
 CLIMAKER=$(BIN)$/climaker
 .ELSE
-CLIMAKER=climaker.exe
+WRAPCMD=$(AUGMENT_LIBRARY_PATH)
+CLIMAKER=$(BIN)$/climaker.exe
 .ENDIF
 
 .INCLUDE : $(BIN)$/cliureversion.mk
@@ -75,7 +76,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_uretypes.config $(OUT)$/bin$/cli_uretypes.
     $(WRAPCMD) $(AL) -out:$@ \
             -version:$(CLI_URETYPES_POLICY_VERSION) \
             -keyfile:$(BIN)$/cliuno.snk \
-            -link:cli_uretypes.config,$(BIN)$/cli_uretypes.config
+            -link:$(CLI_URETYPES_CONFIG)
 
 #Create the config file that is used with the policy assembly
 $(BIN)$/cli_uretypes.config: cli_uretypes_config $(BIN)$/cliureversion.mk 
diff --git a/cli_ure/util/makefile.pmk b/cli_ure/util/makefile.pmk
index 7dbe19172f29..2422dc2d373d 100644
--- a/cli_ure/util/makefile.pmk
+++ b/cli_ure/util/makefile.pmk
@@ -27,9 +27,23 @@
 
 # no translation here anyway
 .IF "$(L10N_framework)"==""
-.IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)"== "MSC10" || "$(ENABLE_MONO)" == "YES"
+.IF "$(COM)" == "MSC" || "$(ENABLE_MONO)" == "YES"
 BUILD_FOR_CLI = "true"
 CFLAGSENABLESYMBOLS:=-Z7
 .ENDIF
+CLI_BASETYPES_CONFIG=
+CLI_URETYPES_CONFIG=
+CLI_URE_CONFIG=
+.IF "$(ENABLE_MONO)" == "YES"
+CLI_BASETYPES_CONFIG=cli_basetypes.config,$(BIN)$/cli_basetypes.config
+CLI_URETYPES_CONFIG=cli_uretypes.config,$(BIN)$/cli_uretypes.config
+CLI_URE_CONFIG=cli_ure.config,$(BIN)$/cli_ure.config
+.ENDIF
+.IF "$(COM)" == "MSC"
+CLI_BASETYPES_CONFIG=$(BIN)$/cli_basetypes.config
+CLI_URETYPES_CONFIG=$(BIN)$/cli_uretypes.config
+CLI_URE_CONFIG=$(BIN)$/cli_ure.config
+.ENDIF
+
 .ENDIF			# "L10N_framework"==""