ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/Makefile.in
(Generate patch)

Comparing SheepShaver/src/Unix/Makefile.in (file contents):
Revision 1.23 by gbeauche, 2004-11-25T19:14:15Z vs.
Revision 1.31 by gbeauche, 2005-03-28T09:06:46Z

# Line 24 | Line 24 | LIBS = @LIBS@
24   SYSSRCS = @SYSSRCS@
25   CPUSRCS = @CPUSRCS@
26   MONSRCS = @MONSRCS@
27 + PERL = @PERL@
28 + USE_DYNGEN = @USE_DYNGEN@
29   DYNGENSRCS = @DYNGENSRCS@
30   DYNGEN_CC = @DYNGEN_CC@
31   DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
# Line 34 | Line 36 | INSTALL = @INSTALL@
36   INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
37   INSTALL_DATA = @INSTALL_DATA@
38  
39 + # Append disassembler to dyngen, if available
40 + ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
41 + DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
42 + endif
43 +
44   ## Files
45 < SRCS = main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp sys_unix.cpp \
45 > SRCS = ../main.cpp main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp sys_unix.cpp \
46      ../rom_patches.cpp ../rsrc_patches.cpp ../emul_op.cpp ../name_registry.cpp \
47      ../macos_util.cpp ../timer.cpp timer_unix.cpp ../xpram.cpp xpram_unix.cpp \
48      ../adb.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
# Line 90 | Line 97 | $(APP)_app: $(APP) ../MacOSX/Info.plist
97          cp -f ../MacOSX/SheepShaver.icns $(APP_APP)/Contents/Resources/
98  
99   modules:
100 <        cd NetDriver; make
100 >        cd Linux/NetDriver; make
101  
102   install: $(APP_EXE) installdirs
103          $(INSTALL_PROGRAM) $(APP_EXE) $(DESTDIR)$(bindir)/$(APP_EXE)
# Line 130 | Line 137 | $(OBJ_DIR)/%.o : %.cpp
137   $(OBJ_DIR)/%.o : %.mm
138          $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
139   $(OBJ_DIR)/%.o : %.S
140 <        $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.s
141 <        $(AS) $(ASFLAGS) -o $@ $*.s
142 <        rm $*.s
140 >        $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.out.s
141 >        $(AS) $(ASFLAGS) -o $@ $*.out.s
142 >        rm $*.out.s
143  
144   # Kheperix CPU emulator
145   kpxsrcdir = ../kpx_cpu/src
146 < GENEXEC   = $(kpxsrcdir)/cpu/ppc/genexec.pl
146 > GENEXECPL = $(kpxsrcdir)/cpu/ppc/genexec.pl
147   DYNGEN    = dyngen$(EXEEXT)
148  
149 < ifneq ($(DYNGENSRCS),)
149 > ifeq ($(USE_DYNGEN),yes)
150   DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
151  
152   $(DYNGEN): $(DYNGENOBJS)
# Line 161 | Line 168 | $(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)
168   endif
169  
170   $(OBJ_DIR)/ppc-execute.o: ppc-execute-impl.cpp
171 < ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXEC) $(DYNGENDEPS)
172 <        $(CPP) $(CPPFLAGS) -DGENEXEC $< | $(GENEXEC) > $@
171 > ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXECPL) $(DYNGENDEPS)
172 >        $(CPP) $(CPPFLAGS) -DGENEXEC $< | $(PERL) $(GENEXECPL) > $@
173  
174   # PowerPC CPU tester
175 < TESTSRCS_ = cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp 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
175 > 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
176 > ifeq ($(USE_DYNGEN),yes)
177 > TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp
178 > endif
179   TESTSRCS  = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)
180  
181   define TESTSRCS_LIST_TO_OBJS

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines