Kaydet (Commit) 0d2542d6 authored tarafından Michael Stahl's avatar Michael Stahl

gbuild, cli_ure: Win32 make issues with back and forward slashes

It looks like what works is to give the source file names with
backslashes but everything else with forward slashes?

Change-Id: Iaf910ab5fc41984d1315a30b164a334d28344c16
üst fbbce4cb
......@@ -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,\
......
......@@ -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) \
......
......@@ -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,%)
......
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