mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-11-23 04:33:24 +00:00
Don't build a built-in GUI with --enable-standalone-gui was requested
This commit is contained in:
parent
51a5e4c0da
commit
b9b1fd4e22
@ -73,10 +73,10 @@ GUI_APP = SheepShaverGUI
|
||||
GUI_APP_EXE = $(GUI_APP)$(EXEEXT)
|
||||
GUI_APP_APP = $(GUI_APP).app
|
||||
PROGS += $(GUI_APP_EXE)
|
||||
endif
|
||||
|
||||
else
|
||||
CXXFLAGS += $(GUI_CFLAGS)
|
||||
LIBS += $(GUI_LIBS)
|
||||
endif
|
||||
|
||||
## Rules
|
||||
.PHONY: modules install uninstall clean distclean depend dep
|
||||
|
@ -246,10 +246,8 @@ UISRCS=../dummy/prefs_editor_dummy.cpp
|
||||
case "x$WANT_GTK" in
|
||||
xgtk2*)
|
||||
AM_PATH_GTK_2_0(1.3.15, [
|
||||
AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
|
||||
GUI_CFLAGS="$GTK_CFLAGS"
|
||||
GUI_LIBS="$GTK_LIBS"
|
||||
UISRCS=prefs_editor_gtk.cpp
|
||||
WANT_GTK=gtk2
|
||||
], [
|
||||
case "x${WANT_GTK}x" in
|
||||
@ -267,15 +265,17 @@ xgtk2*)
|
||||
esac
|
||||
if [[ "x$WANT_GTK" = "xgtk" ]]; then
|
||||
AM_PATH_GTK(1.2.0, [
|
||||
AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
|
||||
GUI_CFLAGS="$GTK_CFLAGS"
|
||||
GUI_LIBS="$GTK_LIBS"
|
||||
UISRCS=prefs_editor_gtk.cpp
|
||||
], [
|
||||
AC_MSG_WARN([Could not find GTK+, disabling user interface.])
|
||||
WANT_GTK=no
|
||||
])
|
||||
fi
|
||||
if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
|
||||
AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
|
||||
UISRCS=prefs_editor_gtk.cpp
|
||||
fi
|
||||
AC_SUBST(GUI_CFLAGS)
|
||||
AC_SUBST(GUI_LIBS)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user