diff options
| -rw-r--r-- | cli_ure/Library_cli_cppuhelper_native.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CliAssembly.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CliLibrary.mk | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index fa55e42e906c..952bba86969d 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_add_cxxflags,cli_cppuhelper,\ $(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\ -ignore:4248 \ - -keyfile:$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk) \ + -keyfile:$(SRCDIR)/cli_ure/source/cliuno.snk \ )) $(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\ diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index 5683ae7b2c2d..a745e8e1ec64 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -59,7 +59,7 @@ $(call gb_Helper_abbreviate_dirs,\ -nologo \ -out:$(CLI_ASSEMBLY_OUTFILE) \ -version:$(CLI_ASSEMBLY_VERSION) \ - -keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \ + -keyfile:$(CLI_ASSEMBLY_KEYFILE) \ -link:$(CLI_ASSEMBLY_CONFIGFILE) \ $(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \ touch $(1) \ diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 3883e7f63471..8c863a72e05a 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -33,20 +33,20 @@ endif gb_CliLibrary__get_source = $(SRCDIR)/$(1).cs gb_CliLibrary__get_generated_source = $(WORKDIR)/$(1).cs +# csc has silly problems handling files passed on command line define gb_CliLibrary__command $(call gb_Output_announce,$(2),$(true),CSC,3) -$(call gb_Helper_abbreviate_dirs,\ - csc $(call gb_Helper_windows_path, \ + csc \ $(call gb_CliLibrary__get_csflags) \ $(CLI_CSCFLAGS) \ -target:library \ -out:$(1) \ - -keyfile:$(call gb_Helper_windows_path,$(CLI_KEYFILE)) \ + -keyfile:$(CLI_KEYFILE) \ -reference:System.dll \ $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \ - $(CLI_SOURCES) \ - ) \ -) + $(subst /,\,$(CLI_SOURCES)) \ + + endef .PHONY : $(call gb_CliLibrary_get_clean_target,%) |