diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in index 97311a9d..aa330deb 100644 --- a/BasiliskII/src/Unix/Makefile.in +++ b/BasiliskII/src/Unix/Makefile.in @@ -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 \ diff --git a/BasiliskII/src/Unix/clip_unix.cpp b/BasiliskII/src/Unix/clip_unix.cpp index 4b7a69e9..ad977db1 100644 --- a/BasiliskII/src/Unix/clip_unix.cpp +++ b/BasiliskII/src/Unix/clip_unix.cpp @@ -19,6 +19,9 @@ */ #include "sysdeps.h" + +#include + #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 +// 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 } diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac index 6f5cd6a6..79cbc405 100644 --- a/BasiliskII/src/Unix/configure.ac +++ b/BasiliskII/src/Unix/configure.ac @@ -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