diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-06 23:21:49 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-22 08:15:27 +0200 |
| commit | 39c530ce5551ab1d104fa8a9ffd12aa308923c0d (patch) | |
| tree | acac705f97ede1e62bc00eea21d9e286ef65ba18 /cli_ure | |
| parent | e1afb8a09dea41c3d7a6e27835e0d79d851b1b03 (diff) | |
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
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/CustomTarget_cli_ure_assemblies.mk | 6 | ||||
| -rw-r--r-- | cli_ure/source/native/path.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index 6773848e1e79..da66178251d1 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -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: diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx index 087e0cfaf87d..97c7f36c58b3 100644 --- a/cli_ure/source/native/path.cxx +++ b/cli_ure/source/native/path.cxx @@ -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++) { |