Ported some modifications from trunk, also set the version number.

This commit is contained in:
yabause 2013-11-28 00:51:09 +00:00
parent cf7df1ad13
commit 71231d8c24
3 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
dnl --- Package name is first argument to AC_INIT dnl --- Package name is first argument to AC_INIT
dnl --- Release version is second argument to AC_INIT dnl --- Release version is second argument to AC_INIT
AC_INIT(desmume, [svn]) AC_INIT(desmume, [0.9.10])
dnl -- find host architecture for some os specific libraries dnl -- find host architecture for some os specific libraries
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -13,7 +13,7 @@ case $host in
esac esac
AC_SUBST(desmume_arch) AC_SUBST(desmume_arch)
AM_INIT_AUTOMAKE([1.10 subdir-objects]) AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax])
dnl -- make sure we have a c++ compiler dnl -- make sure we have a c++ compiler
AC_PROG_CXX AC_PROG_CXX

View File

@ -31,7 +31,7 @@ static bool glx_init(void) { return true; }
static GLXContext ctx; static GLXContext ctx;
static GLXPbuffer pbuf; static GLXPbuffer pbuf;
void deinit_glx_3Demu(void) int deinit_glx_3Demu(void)
{ {
Display *dpy = glXGetCurrentDisplay(); Display *dpy = glXGetCurrentDisplay();

View File

@ -20,5 +20,5 @@
#ifdef HAVE_GL_GLX #ifdef HAVE_GL_GLX
int init_glx_3Demu(void); int init_glx_3Demu(void);
void deinit_glx_3Demu(void); int deinit_glx_3Demu(void);
#endif #endif