mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-06-01 07:41:57 +00:00
- improved configuration and installation
This commit is contained in:
cebix
parent
8b4ef4fb2a
commit
183447c2d7
|
|
@ -1,12 +1,24 @@
|
|||
.TH BasiliskII 1 "June, 1999" "Version 0.6 (alpha)" "Mac II Emulation"
|
||||
.TH BasiliskII 1 "October, 1999" "Version 0.7 (alpha)" "Mac II Emulation"
|
||||
.SH NAME
|
||||
Basilisk II - a free, portable Mac II emulator
|
||||
Basilisk II \- a free, portable Mac II emulator
|
||||
.SH SYNOPSIS
|
||||
.B BasiliskII
|
||||
.SH DESCRIPTION
|
||||
.B Basilisk II
|
||||
is an attempt at creating a free, portable 68k Mac emulator.
|
||||
For more information, see the included "README" file.
|
||||
.SH FILES
|
||||
.PD 0
|
||||
.TP
|
||||
.I /usr/share/BasiliskII/keycodes
|
||||
X server keycodes definitions.
|
||||
.TP
|
||||
.I ~/.basilisk_ii_prefs
|
||||
User-specific configuration file.
|
||||
.TP
|
||||
.I ~/.basilisk_ii_nvram
|
||||
Contents of Mac non-volatile RAM.
|
||||
.PD 1
|
||||
.SH BUGS
|
||||
Several. See the included "TODO" file.
|
||||
.SH SEE ALSO
|
||||
|
|
|
|||
|
|
@ -3,18 +3,19 @@
|
|||
## System specific configuration
|
||||
@SET_MAKE@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
bindir=$(exec_prefix)/bin
|
||||
sharedir=$(prefix)/share/BasiliskII
|
||||
mandir=$(prefix)/man
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
man1dir = $(mandir)/man1
|
||||
|
||||
CC = @CC@
|
||||
CXX = @CXX@
|
||||
CFLAGS = @CFLAGS@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@ -I../include -I. @CPUINCLUDES@
|
||||
DEFS = @DEFS@ @DEFINES@ -D_REENTRANT -DSHAREDIR=\"$(sharedir)\"
|
||||
DEFS = @DEFS@ @DEFINES@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\"
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
SYSSRCS = @SYSSRCS@
|
||||
|
|
@ -33,7 +34,7 @@ SRCS=../prefs.cpp ../rom_patches.cpp ../slot_rom.cpp ../rsrc_patches.cpp ../emul
|
|||
APP = BasiliskII
|
||||
|
||||
## Rules
|
||||
.PHONY: clean distclean realclean depend
|
||||
.PHONY: modules install uninstall clean distclean depend
|
||||
|
||||
default: $(APP)
|
||||
|
||||
|
|
@ -58,27 +59,24 @@ modules:
|
|||
cd Linux/NetDriver; make
|
||||
|
||||
install: $(APP)
|
||||
$(INSTALL_PROGRAM) BasiliskII $(bindir)/
|
||||
$(INSTALL_DATA) BasiliskII.1 $(mandir)/man1/
|
||||
$(INSTALL) -d $(sharedir)
|
||||
$(INSTALL_DATA) keycodes $(sharedir)
|
||||
$(INSTALL_PROGRAM) $(APP) $(bindir)
|
||||
$(INSTALL_DATA) $(APP).1 $(man1dir)
|
||||
$(INSTALL) -d $(datadir)/$(APP)
|
||||
$(INSTALL_DATA) keycodes $(datadir)/$(APP)
|
||||
|
||||
uninstall:
|
||||
-rm -f $(bindir)/BasiliskII
|
||||
-rm -f $(mandir)/man1/BasiliskII.1
|
||||
-rm -rf $(sharedir)
|
||||
-rm -f $(bindir)/$(APP)
|
||||
-rm -f $(man1dir)/$(APP).1
|
||||
-rm -rf $(datadir)/$(APP)
|
||||
|
||||
clean:
|
||||
-rm -f $(OBJ_DIR)/* core* *.core *~ *.bak
|
||||
-rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak
|
||||
-rm -f cpuemu.cpp cpudefs.cpp cputmp.s cpufast*.s cpustbl.cpp cputbl.h
|
||||
|
||||
distclean: clean
|
||||
-rm -rf $(OBJ_DIR)
|
||||
-rm -f Makefile
|
||||
-rm -f config.cache config.log config.status config.h
|
||||
-strip $(APP)
|
||||
|
||||
realclean: distclean
|
||||
-rm -f $(APP)
|
||||
|
||||
depend dep:
|
||||
makedepend $(CPPFLAGS) -Y ../*.cpp ../*.c *.cpp
|
||||
|
|
|
|||
|
|
@ -37,28 +37,34 @@
|
|||
/* The number of bytes in a long. */
|
||||
#undef SIZEOF_LONG
|
||||
|
||||
/* The number of bytes in a short. */
|
||||
#undef SIZEOF_SHORT
|
||||
|
||||
/* The number of bytes in a long long. */
|
||||
#undef SIZEOF_LONG_LONG
|
||||
|
||||
/* Define if you have the strdup function. */
|
||||
#undef HAVE_STRDUP
|
||||
/* The number of bytes in a short. */
|
||||
#undef SIZEOF_SHORT
|
||||
|
||||
/* Define if you have the cfmakeraw function. */
|
||||
#undef HAVE_CFMAKERAW
|
||||
|
||||
/* Define if you have the pthread_cancel function. */
|
||||
#undef HAVE_PTHREAD_CANCEL
|
||||
|
||||
/* Define if you have the nanosleep function. */
|
||||
#undef HAVE_NANOSLEEP
|
||||
|
||||
/* Define if you have the clock_gettime function. */
|
||||
/* Define if you have the clock_gettime function. */
|
||||
#undef HAVE_CLOCK_GETTIME
|
||||
|
||||
/* Define if you have the timer_create function. */
|
||||
/* Define if you have the nanosleep function. */
|
||||
#undef HAVE_NANOSLEEP
|
||||
|
||||
/* Define if you have the pthread_cancel function. */
|
||||
#undef HAVE_PTHREAD_CANCEL
|
||||
|
||||
/* Define if you have the sem_init function. */
|
||||
#undef HAVE_SEM_INIT
|
||||
|
||||
/* Define if you have the semget function. */
|
||||
#undef HAVE_SEMGET
|
||||
|
||||
/* Define if you have the strdup function. */
|
||||
#undef HAVE_STRDUP
|
||||
|
||||
/* Define if you have the timer_create function. */
|
||||
#undef HAVE_TIMER_CREATE
|
||||
|
||||
/* Define if you have the <fcntl.h> header file. */
|
||||
|
|
@ -69,6 +75,3 @@
|
|||
|
||||
/* Define if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define if you have the posix4 library (-lposix4). */
|
||||
#undef HAVE_LIBPOSIX4
|
||||
|
|
|
|||
166
BasiliskII/src/Unix/configure
vendored
166
BasiliskII/src/Unix/configure
vendored
|
|
@ -916,88 +916,8 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:921: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
fi
|
||||
if test -z "$CPP"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
# This must be in double quotes, not single quotes, because CPP may get
|
||||
# substituted into the Makefile and "${CC-cc}" will confuse make.
|
||||
CPP="${CC-cc} -E"
|
||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 936 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 953 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 970 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP=/lib/cpp
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
rm -f conftest*
|
||||
ac_cv_prog_CPP="$CPP"
|
||||
fi
|
||||
CPP="$ac_cv_prog_CPP"
|
||||
else
|
||||
ac_cv_prog_CPP="$CPP"
|
||||
fi
|
||||
echo "$ac_t""$CPP" 1>&6
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:1001: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:921: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1054,7 +974,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
|
|||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:1058: checking for a BSD compatible install" >&5
|
||||
echo "configure:978: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1107,6 +1027,86 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
|
|||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:1032: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
fi
|
||||
if test -z "$CPP"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
# This must be in double quotes, not single quotes, because CPP may get
|
||||
# substituted into the Makefile and "${CC-cc}" will confuse make.
|
||||
CPP="${CC-cc} -E"
|
||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1047 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1064 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1081 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP=/lib/cpp
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
rm -f conftest*
|
||||
ac_cv_prog_CPP="$CPP"
|
||||
fi
|
||||
CPP="$ac_cv_prog_CPP"
|
||||
else
|
||||
ac_cv_prog_CPP="$CPP"
|
||||
fi
|
||||
echo "$ac_t""$CPP" 1>&6
|
||||
|
||||
# If we find X, set shell vars x_includes and x_libraries to the
|
||||
# paths, otherwise set no_x=yes.
|
||||
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
||||
|
|
@ -3770,11 +3770,11 @@ s%@infodir@%$infodir%g
|
|||
s%@mandir@%$mandir%g
|
||||
s%@CC@%$CC%g
|
||||
s%@CXX@%$CXX%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@SET_MAKE@%$SET_MAKE%g
|
||||
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
||||
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
|
||||
s%@INSTALL_DATA@%$INSTALL_DATA%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@X_CFLAGS@%$X_CFLAGS%g
|
||||
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
|
||||
s%@X_LIBS@%$X_LIBS%g
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ AC_ARG_ENABLE(ui, [ --enable-ui use GTK user interface (default)],
|
|||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CPP
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_INSTALL
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,11 @@
|
|||
#error "You don't have ANSI C header files."
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
# include <sys/types.h>
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -39,10 +43,6 @@
|
|||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_FCNTL_H
|
||||
# include <fcntl.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ enum {
|
|||
|
||||
|
||||
// Constants
|
||||
const char KEYCODE_FILE_NAME[] = SHAREDIR "/keycodes";
|
||||
const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
|
||||
|
||||
|
||||
// Global variables
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user