Kaydet (Commit) 39c530ce authored tarafından Matúš Kukan's avatar Matúš Kukan Kaydeden (comit) David Tardon

force cli_ure to build

- there is still missing dependency on cliuno.snk
- remove -warnaserror+ causing weird problem
- export random symbol so that we get icli_cppuhelper_native.lib file
  created

Change-Id: Ifd3b4785f83496d2c9bff6b1ea2fd39b6978725c
üst e1afb8a0
......@@ -43,20 +43,20 @@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
$(GNUCOPY) $< $@.tmp && \
echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)" )]' >> $@.tmp && \
$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(OUTDIR)/bin/cliuno.snk" )]' >> $@.tmp &&) \
$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.tmp &&) \
mv $@.tmp $@
# TODO use macros for this
$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
$(GNUCOPY) $< $@.tmp && \
echo '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' >> $@.tmp && \
echo '[assembly:System::Reflection::AssemblyKeyFile( "$(OUTDIR)/bin/cliuno.snk" )];' >> $@.tmp && \
echo '[assembly:System::Reflection::AssemblyKeyFile( "$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )];' >> $@.tmp && \
mv $@.tmp $@
$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
$(GNUCOPY) $< $@.tmp && \
echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)" )]' >> $@.tmp && \
$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(OUTDIR)/bin/cliuno.snk" )]' >> $@.tmp &&) \
$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.tmp &&) \
mv $@.tmp $@
# vim: set noet sw=4 ts=4:
......@@ -30,7 +30,7 @@
namespace cli_ure {
WCHAR * filename(WCHAR * path) {
SAL_DLLPUBLIC_EXPORT WCHAR * filename(WCHAR * path) {
WCHAR * f = path;
for (WCHAR * p = path;;) {
switch (*p++) {
......
......@@ -13,7 +13,6 @@ gb_CliLibraryTarget_EXT := $(gb_CliAssembly_POLICYEXT)
gb_CliLibraryTarget_CSCFLAGS := \
-noconfig \
-warnaserror+
gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
-checked+ \
......
......@@ -740,7 +740,7 @@ gb_InstallScript_EXT := .inf
# CliAssemblyTarget class
gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
gb_CliAssemblyTarget_get_dll = $(gb_Library_OUTDIRLOCATION)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
gb_CliAssemblyTarget_get_dll = $(OUTDIR)/bin/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
# ExtensionTarget class
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment