The-Homebrew-Cloud/Ryujinx-GtkSharp
2
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2024-07-01 18:46:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix API version for cairo and don't hardcode it

Browse Source 
Cairo has a different API version that was hardcoded. Define it in a new
variable in configure.ac and use it in AssemblyInfo and Makefile.am.

This fixes make distcheck, as the cairo-sharp.dll assembly was not
getting uninstalled from the GAC.
This commit is contained in:
Bertrand Lorentz 2012-07-02 13:56:06 -04:00
parent 64a79b5621
commit 477710bd1e
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cairo/AssemblyInfo.cs → cairo/AssemblyInfo.cs.in
View File

@ -1,5 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly:AssemblyVersion("1.10.0.0")]
[assembly:AssemblyVersion("@CAIRO_API_VERSION@")]
[assembly:AssemblyDelaySign(false)]

5
cairo/Makefile.am
View File

@ -1,5 +1,5 @@
ASSEMBLY_NAME = cairo-sharp
ASSEMBLY_NAME_VERSION = $(ASSEMBLY_NAME),Version=$(API_VERSION)
ASSEMBLY_NAME_VERSION = $(ASSEMBLY_NAME),Version=$(CAIRO_API_VERSION)
ASSEMBLY = $(ASSEMBLY_NAME).dll
SNK = $(srcdir)/mono.snk
@ -11,7 +11,6 @@ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
sources = \
Antialias.cs \
AssemblyInfo.cs \
Cairo.cs \
Content.cs \
Context.cs \
@ -62,7 +61,7 @@ sources = \
XlibSurface.cs \
#
build_sources = $(addprefix $(srcdir)/, $(sources))
build_sources = $(addprefix $(srcdir)/, $(sources)) $(builddir)/AssemblyInfo.cs
$(ASSEMBLY): $(build_sources) $(SNK)
@rm -f $(ASSEMBLY).mdb

3
configure.ac
View File

@ -7,6 +7,8 @@ AM_MAINTAINER_MODE
API_VERSION=3.0.0.0
AC_SUBST(API_VERSION)
CAIRO_API_VERSION=1.10.0.0
AC_SUBST(CAIRO_API_VERSION)
POLICY_VERSIONS=""
AC_SUBST(POLICY_VERSIONS)
@ -230,6 +232,7 @@ gio/Makefile
gio/gio-sharp-3.0.pc
gio/gio-sharp.dll.config
gio/glue/Makefile
cairo/AssemblyInfo.cs
cairo/Makefile
pango/Makefile
pango/pango-sharp.dll.config