From ec3f7e838f2e3123eeb19b5ec40d4a0549a743a1 Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Thu, 21 May 2009 08:26:32 +0000 Subject: [PATCH] Take back CPUEMU_6 - it's used in cycle-exact mode --- Makefile.host | 6 +++--- Makefile.wii | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.host b/Makefile.host index ed4ec13..c1e33de 100644 --- a/Makefile.host +++ b/Makefile.host @@ -28,7 +28,7 @@ SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \ src/filesys.c src/fsdb.c src/fsdb_unix.c src/hardfile_unix.c src/genblitter.c src/gencomp.c src/gencpu.c \ src/hardfile.c src/genlinetoscr.c src/compemu.c src/compstbl.c src/fsusage.c src/filesys_unix.c \ - src/enforcer.c src/ar.c src/debug.c src/cpuemu_6.c \ + src/enforcer.c src/ar.c src/debug.c \ src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS)) # Library object files. @@ -112,8 +112,8 @@ $(BIN_DIR)/%.dol: %.elf # Compilation flags. COMMON_FLAGS := -g -Wall $(MACHDEP) INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I/usr/include/SDL -DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DFPUEMU -DAGA \ - -DAUTOCONFIG +DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \ + -DFPUEMU -DAGA -DAUTOCONFIG CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) #unused defines; -DFDI2RAW diff --git a/Makefile.wii b/Makefile.wii index 8985ff1..ccbaf45 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -33,7 +33,7 @@ SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \ src/filesys.c src/fsdb.c src/fsdb_unix.c src/hardfile_unix.c src/genblitter.c src/gencomp.c src/gencpu.c \ src/hardfile.c src/genlinetoscr.c src/compemu.c src/compstbl.c src/fsusage.c src/filesys_unix.c \ - src/enforcer.c src/ar.c src/debug.c src/cpuemu_6.c \ + src/enforcer.c src/ar.c src/debug.c \ src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS)) # Library object files. @@ -117,8 +117,8 @@ $(BIN_DIR)/%.dol: %.elf # Compilation flags. COMMON_FLAGS := -g -O3 -G8 -mrvl -Wall -D__inline__=__inline__ $(MACHDEP) INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DFPUEMU -DAGA \ - -DAUTOCONFIG +DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \ + -DFPUEMU -DAGA -DAUTOCONFIG CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) #unused defines; -DFDI2RAW