ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: remove GTK_MACOS_HACK 

Not needed anymore sicne we have a great mac os x frontend
This commit is contained in:
riccardom 2012-05-20 14:07:32 +00:00
parent 848c19f3b0
commit 3ad7bec287
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desmume/configure.ac
View File

@ -103,11 +103,6 @@ AC_ARG_ENABLE([hud],
[AC_HELP_STRING([--enable-hud], [Enable HUD rendering, requires libagg])], [AC_HELP_STRING([--enable-hud], [Enable HUD rendering, requires libagg])],
[libagg=yes]) [libagg=yes])
dnl - hack to help zero build gtk frontend macos x package
AC_ARG_ENABLE(macosxhack,
[AC_HELP_STRING(--enable-macosxhack, hack to build MacOSX package)],
[GTK_MACOSX_HACK=yes])
HAVE_OPENAL=no HAVE_OPENAL=no
dnl - openal support dnl - openal support
AC_ARG_ENABLE(openal, AC_ARG_ENABLE(openal,
@ -132,11 +127,6 @@ PKG_CHECK_MODULES(GLIB,
glib-2.0 >= $GLIB_VER, glib-2.0 >= $GLIB_VER,
FOUND_GLIB=yes, FOUND_GLIB=yes,
FOUND_GLIB=no) FOUND_GLIB=no)
if test "x$FOUND_GLIB" = "xno"; then
if test ! "x$GTK_MACOSX_HACK" = "xyes"; then
AC_MSG_ERROR([Glib is required to build desmume])
fi
fi
PKG_CHECK_MODULES(GTK, PKG_CHECK_MODULES(GTK,
gtk+-2.0 >= $GTK_VER, gtk+-2.0 >= $GTK_VER,
@ -291,12 +281,6 @@ case $host in
UI_DIR="windows" UI_DIR="windows"
;; ;;
*darwin*) *darwin*)
if test "x$GTK_MACOSX_HACK" = "xyes" ; then
LIBS="$LIBS -framework Gtk -framework GLib"
CPPFLAGS="$CPPFLAGS -I/Library/Frameworks/Cairo.framework/Headers -I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/GLib.framework/Headers"
GLIB_LIBS=""
AC_SUBST(GLIB_LIBS)
fi
dnl - openal is required on mac os x and we are not able to figure out if it's installed or not dnl - openal is required on mac os x and we are not able to figure out if it's installed or not
AC_DEFINE(HAVE_OPENAL) AC_DEFINE(HAVE_OPENAL)
LIBS="$LIBS -framework OpenGL -framework OpenAL" LIBS="$LIBS -framework OpenGL -framework OpenAL"