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

Use clip_unix.cpp only with X11 targets. Otherwise, default to clip_dummy.cpp

Browse Source
This commit is contained in:
gbeauche 2004-06-23 22:33:45 +00:00
parent cc61fe9dd2
commit c6ff8bc709
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ INSTALL_DATA = @INSTALL_DATA@
SRCS = ../main.cpp main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp \
sys_unix.cpp ../rom_patches.cpp ../slot_rom.cpp ../rsrc_patches.cpp \
../emul_op.cpp ../macos_util.cpp ../xpram.cpp xpram_unix.cpp ../timer.cpp \
timer_unix.cpp clip_unix.cpp ../adb.cpp ../serial.cpp ../ether.cpp \
timer_unix.cpp ../adb.cpp ../serial.cpp ../ether.cpp \
../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp ../video.cpp video_blit.cpp \
vm_alloc.cpp sigsegv.cpp ../audio.cpp ../extfs.cpp extfs_unix.cpp \
../user_strings.cpp user_strings_unix.cpp sshpty.c strlcpy.c \

10
BasiliskII/src/Unix/clip_unix.cpp
View File

@ -19,6 +19,9 @@
*/
#include "sysdeps.h"
#include <X11/Xlib.h>
#include "clip.h"
#include "macos_util.h"
#include "prefs.h"
@ -27,11 +30,8 @@
#include "debug.h"
// From video_x.cpp
#ifndef USE_SDL_VIDEO
#include <X11/Xlib.h>
// From main_unix.cpp
extern Display *x_display;
#endif
// Conversion tables
@ -87,7 +87,6 @@ void PutScrap(uint32 type, void *scrap, int32 length)
if (length <= 0)
return;
#ifndef USE_SDL_VIDEO
switch (type) {
case FOURCC('T','E','X','T'):
D(bug(" clipping TEXT\n"));
@ -111,5 +110,4 @@ void PutScrap(uint32 type, void *scrap, int32 length)
delete[] buf;
break;
}
#endif
}

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

@ -418,10 +418,10 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
fi
if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
VIDEOSRC="../SDL/video_sdl.cpp"
VIDEOSRCS="../SDL/video_sdl.cpp ../dummy/clip_dummy.cpp"
AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
else
VIDEOSRC="video_x.cpp"
VIDEOSRCS="video_x.cpp clip_unix.cpp"
fi
dnl Use 68k CPU natively?
@ -438,7 +438,7 @@ if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
ETHERSRC=../dummy/ether_dummy.cpp
AUDIOSRC=../dummy/audio_dummy.cpp
fi
SYSSRCS="$VIDEOSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
dnl Define a macro that translates a yesno-variable into a C macro definition
dnl to be put into the config.h file