ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glib: don't modify Makefile.am

Browse source 
The new -define flag DISABLE_GTHREAD_CHECK can be added at configure time to already existing $CSFLAGS, as Mike Kestner pointed out.
This commit is contained in:
Andres G. Aragoneses 2012-05-04 22:20:14 +01:00
parent 3862bc75ec
commit b008a626f8
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -82,9 +82,6 @@ AC_ARG_ENABLE(debug, [ --enable-debug Build debugger (.mdb) files for
) )
fi fi
CSFLAGS="$DEBUG_FLAGS $WIN64DEFINES"
AC_SUBST(CSFLAGS)
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "x$PKG_CONFIG" = "xno"; then if test "x$PKG_CONFIG" = "xno"; then
AC_MSG_ERROR([You need to install pkg-config]) AC_MSG_ERROR([You need to install pkg-config])
@ -176,10 +173,14 @@ PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED_VERSION)
AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS) AC_SUBST(GIO_LIBS)
CSFLAGS="$DEBUG_FLAGS $WIN64DEFINES"
PKG_CHECK_MODULES(GLIB_2_31, PKG_CHECK_MODULES(GLIB_2_31,
glib-2.0 >= 2.31, glib-2.0 >= 2.31,
HAVE_GLIB_2_31_OR_HIGHER=yes, HAVE_GLIB_2_31_OR_HIGHER=no) HAVE_GLIB_2_31_OR_HIGHER=yes, HAVE_GLIB_2_31_OR_HIGHER=no)
AM_CONDITIONAL(DISABLE_GTHREAD_CHECK, test "x$HAVE_GLIB_2_31_OR_HIGHER" = "xyes") if test "x$HAVE_GLIB_2_31_OR_HIGHER" = "xyes" ; then
CSFLAGS="$CSFLAGS -define:DISABLE_GTHREAD_CHECK"
fi
AC_SUBST(CSFLAGS)
PKG_CHECK_MODULES(PANGO, pango) PKG_CHECK_MODULES(PANGO, pango)
AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_CFLAGS)

8
glib/Makefile.am
View file

@ -81,15 +81,9 @@ EXTRA_DIST = \
glib-sharp-3.0.pc.in \ glib-sharp-3.0.pc.in \
glib-api.xml glib-api.xml
if DISABLE_GTHREAD_CHECK
BUILD_DEFINES=-define:DISABLE_GTHREAD_CHECK
else
BUILD_DEFINES=
endif
$(ASSEMBLY): $(build_sources) $(SNK) $(ASSEMBLY): $(build_sources) $(SNK)
@rm -f $(ASSEMBLY).mdb @rm -f $(ASSEMBLY).mdb
$(CSC) $(CSFLAGS) -keyfile:$(SNK) -unsafe -out:$(ASSEMBLY) -target:library $(references) $(build_sources) $(BUILD_DEFINES) $(CSC) $(CSFLAGS) -keyfile:$(SNK) -unsafe -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
policy.%.config: $(top_builddir)/policy.config policy.%.config: $(top_builddir)/policy.config
sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@ sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@