Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-26 08:32:20 +00:00
Code Issues Projects Releases Wiki Activity

Don't build a built-in GUI if --enable-standalone-gui was requested.

Browse Source 
The following configurations were tested:
./configure --without-mon --with-gtk=gtk1 --enable-jit-compiler	  [B.GTK1]
./configure --without-mon					  [B.GTK2]
./configure --without-mon --enable-standalone-gui --without-gtk	  [no GUI]
./configure --without-mon --enable-standalone-gui --with-gtk=gtk1 [S.GTK1]
./configure --enable-jit-compiler --enable-standalone-gui	  [S.GTK2]
This commit is contained in:
gbeauche 2006-05-02 05:36:42 +00:00
parent 62389bb3c0
commit 51a5e4c0da
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BasiliskII/src/Unix/Makefile.in
View File

@ -58,10 +58,10 @@ ifeq ($(STANDALONE_GUI),yes)
GUI_APP = BasiliskIIGUI GUI_APP = BasiliskIIGUI
GUI_APP_APP = $(GUI_APP).app GUI_APP_APP = $(GUI_APP).app
PROGS += $(GUI_APP)$(EXEEXT) PROGS += $(GUI_APP)$(EXEEXT)
endif else
CXXFLAGS += $(GUI_CFLAGS) CXXFLAGS += $(GUI_CFLAGS)
LIBS += $(GUI_LIBS) LIBS += $(GUI_LIBS)
endif
## Rules ## Rules
.PHONY: modules install installdirs uninstall mostlyclean clean distclean depend dep .PHONY: modules install installdirs uninstall mostlyclean clean distclean depend dep

8
BasiliskII/src/Unix/configure.ac
View File

@ -253,10 +253,8 @@ UISRCS=../dummy/prefs_editor_dummy.cpp
case "x$WANT_GTK" in case "x$WANT_GTK" in
xgtk2*) xgtk2*)
AM_PATH_GTK_2_0(1.3.15, [ AM_PATH_GTK_2_0(1.3.15, [
AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
GUI_CFLAGS="$GTK_CFLAGS" GUI_CFLAGS="$GTK_CFLAGS"
GUI_LIBS="$GTK_LIBS" GUI_LIBS="$GTK_LIBS"
UISRCS=prefs_editor_gtk.cpp
WANT_GTK=gtk2 WANT_GTK=gtk2
], [ ], [
case "x${WANT_GTK}x" in case "x${WANT_GTK}x" in
@ -274,10 +272,8 @@ xgtk2*)
esac esac
if [[ "x$WANT_GTK" = "xgtk" ]]; then if [[ "x$WANT_GTK" = "xgtk" ]]; then
AM_PATH_GTK(1.2.0, [ AM_PATH_GTK(1.2.0, [
AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
GUI_CFLAGS="$GTK_CFLAGS" GUI_CFLAGS="$GTK_CFLAGS"
GUI_LIBS="$GTK_LIBS" GUI_LIBS="$GTK_LIBS"
UISRCS=prefs_editor_gtk.cpp
dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
dnl includes <libintl.h> dnl includes <libintl.h>
@ -292,6 +288,10 @@ if [[ "x$WANT_GTK" = "xgtk" ]]; then
WANT_GTK=no WANT_GTK=no
]) ])
fi 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_CFLAGS)
AC_SUBST(GUI_LIBS) AC_SUBST(GUI_LIBS)