Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-08-16 02:27:31 +00:00
Code Issues Projects Releases Wiki Activity

in case backend is not X

Browse Source
This commit is contained in:
kanjitalk755
2020-02-07 11:04:02 +09:00
parent c23967b03b
commit 1a875b1c10
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CPUINCLUDES_FLAGS=@CPUINCLUDES@ CPUINCLUDES_FLAGS=@CPUINCLUDES@
CPUINCLUDES_FLAGS:=$(CPUINCLUDES_FLAGS:-I%=-I@top_srcdir@/%) CPUINCLUDES_FLAGS:=$(CPUINCLUDES_FLAGS:-I%=-I@top_srcdir@/%)
CPPFLAGS = @CPPFLAGS@ -I@top_srcdir@/../include -I@top_srcdir@/. -I. -I@top_srcdir@/../CrossPlatform $(CPUINCLUDES_FLAGS) -I@top_srcdir@/../slirp CPPFLAGS = @CPPFLAGS@ -I/opt/X11/include -I@top_srcdir@/../include -I@top_srcdir@/. -I. -I@top_srcdir@/../CrossPlatform $(CPUINCLUDES_FLAGS) -I@top_srcdir@/../slirp
DEFS = @DEFS@ @DEFINES@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\" DEFS = @DEFS@ @DEFINES@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\"
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@

6
BasiliskII/src/Unix/main_unix.cpp
View File

@@ -63,7 +63,9 @@ struct sigstate {
# ifdef HAVE_GNOMEUI # ifdef HAVE_GNOMEUI
# include <gnome.h> # include <gnome.h>
# endif # endif
# include <X11/Xlib.h> # ifndef GDK_WINDOWING_WAYLAND
# include <X11/Xlib.h>
# endif
#endif #endif
#ifdef ENABLE_XF86_DGA #ifdef ENABLE_XF86_DGA
@@ -385,7 +387,7 @@ static void usage(const char *prg_name)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#ifdef ENABLE_GTK #if defined(ENABLE_GTK) && !defined(GDK_WINDOWING_WAYLAND)
XInitThreads(); XInitThreads();
#endif #endif
const char *vmdir = NULL; const char *vmdir = NULL;

2
SheepShaver/src/Unix/Makefile.in
View File

@@ -17,7 +17,7 @@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../CrossPlatform -I../slirp CPPFLAGS = @CPPFLAGS@ -I/opt/X11/include -I../include -I. -I../CrossPlatform -I../slirp
DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\" DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\"
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@

4
SheepShaver/src/Unix/main_unix.cpp
View File

@@ -133,8 +133,10 @@
#ifdef ENABLE_GTK #ifdef ENABLE_GTK
#include <gtk/gtk.h> #include <gtk/gtk.h>
#ifndef GDK_WINDOWING_WAYLAND
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
#endif
#ifdef ENABLE_XF86_DGA #ifdef ENABLE_XF86_DGA
#include <X11/Xlib.h> #include <X11/Xlib.h>
@@ -729,7 +731,7 @@ static bool init_sdl()
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#ifdef ENABLE_GTK #if defined(ENABLE_GTK) && !defined(GDK_WINDOWING_WAYLAND)
XInitThreads(); XInitThreads();
#endif #endif
char str[256]; char str[256];