Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-12 16:30:44 +00:00
Code Issues Projects Releases Wiki Activity

better handling of no-dyngen cases in makefiles

Browse Source
This commit is contained in:
gbeauche 2005-01-10 22:50:54 +00:00
parent d075282607
commit fb3f855d29
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ LIBS = @LIBS@
SYSSRCS = @SYSSRCS@ SYSSRCS = @SYSSRCS@
CPUSRCS = @CPUSRCS@ CPUSRCS = @CPUSRCS@
MONSRCS = @MONSRCS@ MONSRCS = @MONSRCS@
USE_DYNGEN = @USE_DYNGEN@
DYNGENSRCS = @DYNGENSRCS@ DYNGENSRCS = @DYNGENSRCS@
DYNGEN_CC = @DYNGEN_CC@ DYNGEN_CC = @DYNGEN_CC@
DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@ DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
@ -35,7 +36,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
# Append disassembler to dyngen, if available # Append disassembler to dyngen, if available
ifneq (:,$(MONSRCS):$(DYNGENSRCS)) ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS)) DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
endif endif
@ -144,7 +145,7 @@ kpxsrcdir = ../kpx_cpu/src
GENEXEC = $(kpxsrcdir)/cpu/ppc/genexec.pl GENEXEC = $(kpxsrcdir)/cpu/ppc/genexec.pl
DYNGEN = dyngen$(EXEEXT) DYNGEN = dyngen$(EXEEXT)
ifneq ($(DYNGENSRCS),) ifeq ($(USE_DYNGEN),yes)
DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
$(DYNGEN): $(DYNGENOBJS) $(DYNGEN): $(DYNGENOBJS)
@ -171,7 +172,7 @@ ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXEC) $(DYNGENDEP
# PowerPC CPU tester # PowerPC CPU tester
TESTSRCS_ = mathlib/ieeefp.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp TESTSRCS_ = mathlib/ieeefp.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp
ifneq ($(DYNGENSRCS),) ifeq ($(USE_DYNGEN),yes)
TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp
endif endif
TESTSRCS = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp) TESTSRCS = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)

3
SheepShaver/src/Unix/configure.ac
View File

@ -1110,6 +1110,8 @@ if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
ac_cv_have_static_data_exec=no ac_cv_have_static_data_exec=no
) )
]) ])
else
ac_cv_use_dyngen=no
fi fi
AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec", AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
[Define if your system marks static data pages as executable.]) [Define if your system marks static data pages as executable.])
@ -1119,6 +1121,7 @@ if [[ "x$WANT_JIT" = "xyes" ]]; then
fi fi
dnl Generate Makefile. dnl Generate Makefile.
AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
AC_SUBST(DYNGENSRCS) AC_SUBST(DYNGENSRCS)
AC_SUBST(DYNGEN_CC) AC_SUBST(DYNGEN_CC)
AC_SUBST(DYNGEN_OP_FLAGS) AC_SUBST(DYNGEN_OP_FLAGS)