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

Add configure macros to check for -framework Carbon and -framwork IOKit so

Browse Source 
that we can include ../MacOSX/clip_macosx.cpp (clipboard support),
../MacOSX/sys_darwin.cpp (cdrom, floppy et al. support). Also handle new
SDL keycodes file.
This commit is contained in:
gbeauche 2004-06-27 22:12:52 +00:00
parent f3fbf06674
commit 4b680a1ccb
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ DYNGENSRCS = @DYNGENSRCS@
DYNGEN_CC = @DYNGEN_CC@
DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
BLESS = @BLESS@
KEYCODEs = @KEYCODES@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
INSTALL_DATA = @INSTALL_DATA@
@ -80,7 +81,7 @@ modules:
install: $(APP) installdirs
$(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP)
-$(INSTALL_DATA) $(APP).1 $(DESTDIR)$(man1dir)/$(APP).1
$(INSTALL_DATA) keycodes $(DESTDIR)$(datadir)/$(APP)/keycodes
$(INSTALL_DATA) $(KEYCODES) $(DESTDIR)$(datadir)/$(APP)/keycodes
$(INSTALL_DATA) tunconfig $(DESTDIR)$(datadir)/$(APP)/tunconfig
chmod 755 $(DESTDIR)$(datadir)/$(APP)/tunconfig

38
SheepShaver/src/Unix/configure.in
View File

@ -273,6 +273,28 @@ no:linux*)
;;
esac
dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
AC_DEFUN(AC_CHECK_FRAMEWORK, [
AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
AC_CACHE_CHECK([whether compiler supports framework $1],
ac_Framework, [
saved_LIBS="$LIBS"
LIBS="$LIBS -framework $1"
AC_TRY_LINK(
[$2], [int main(void) { return 0; }],
[AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
)
])
AS_IF([test AS_VAR_GET(ac_Framework) = yes],
[AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
)
AS_VAR_POPDEF([ac_Framework])dnl
])
dnl Check for some MacOS X frameworks
AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
dnl Select system-dependant sources.
SERIALSRC=serial_unix.cpp
ETHERSRC=../dummy/ether_dummy.cpp
@ -292,6 +314,9 @@ darwin*)
if [[ "x$EMULATED_PPC" = "xno" ]]; then
EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
fi
if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
fi
;;
esac
@ -300,10 +325,18 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
fi
if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
VIDEOSRCS="../SDL/video_sdl.cpp ../dummy/clip_dummy.cpp"
VIDEOSRCS="../SDL/video_sdl.cpp"
AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
KEYCODES="../SDL/keycodes"
if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
else
EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
fi
else
VIDEOSRCS="video_x.cpp clip_unix.cpp"
VIDEOSRCS="video_x.cpp"
KEYCODES="keycodes"
EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
fi
SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
@ -868,6 +901,7 @@ AC_SUBST(DYNGEN_OP_FLAGS)
AC_SUBST(SYSSRCS)
AC_SUBST(CPUSRCS)
AC_SUBST(BLESS)
AC_SUBST(KEYCODES)
AC_OUTPUT(Makefile)
dnl Print summary.