Fix build on Windows

- use -option instead of /option
 - use path\file.cs for csc.exe and path/file.cs for mcs
 - don't build samples/gtk-video-player when using csc.exe
This commit is contained in:
Maarten Bosmans 2009-05-26 15:35:00 +02:00 committed by Sebastian Dröge
parent 35198f1773
commit febcfd772c
4 changed files with 15 additions and 6 deletions

View file

@ -42,12 +42,13 @@ else
LIB_SUFFIX=.dll
fi
fi
AM_CONDITIONAL(USE_MONO_COMPILER, test "x$has_mono" = "xtrue")
CS="C#"
if test "x$CSC" = "xno" ; then
AC_MSG_ERROR([No $CS compiler found])
fi
AC_PATH_PROG(GACUTIL, gacutil, no)
if test "x$GACUTIL" = "xno" ; then
AC_MSG_ERROR([No gacutil tool found])

View file

@ -64,5 +64,5 @@ EXTRA_DIST = \
$(dist_sources)
gst-gapi_codegen.exe: $(build_sources)
$(CSC) /debug /out:gst-gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)
$(CSC) -debug -out:gst-gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)

View file

@ -71,6 +71,11 @@ overrides = \
override/NavigationAdapter.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
if USE_MONO_COMPILER
csc_build_sources = $(build_sources)
else
csc_build_sources = $(subst /,\\,$(build_sources))
endif
customs = \
Bin.custom \
@ -135,5 +140,5 @@ $(KEYFILE): $(top_srcdir)/gstreamer-sharp.snk
cp $(top_srcdir)/gstreamer-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp $(KEYFILE)
$(CSC) /nowarn:0612 /debug /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
$(CSC) -nowarn:0612 -debug -unsafe -out:$(ASSEMBLY) -target:library $(references) $(csc_build_sources) $(GENERATED_SOURCES)

View file

@ -1,10 +1,13 @@
TARGETS = playbin-player.exe decodebin-transcoder.exe helloworld.exe typefind.exe metadata.exe gtk-video-player.exe
if USE_MONO_COMPILER
MCS_TARGETS = gtk-video-player.exe
endif
TARGETS = playbin-player.exe decodebin-transcoder.exe helloworld.exe typefind.exe metadata.exe $(MCS_TARGETS)
DEBUGS = $(addsuffix .mdb, $(TARGETS))
all: $(TARGETS) link
assemblies=$(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll
references=$(addprefix /r:, $(assemblies))
references=$(addprefix -r:, $(assemblies))
playbin-player.exe: $(srcdir)/PlayBinPlayer.cs $(assemblies)
$(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(srcdir)/PlayBinPlayer.cs