From: notaz <notasas@gmail.com>
Date: Sun, 28 Oct 2007 20:23:15 +0000 (+0000)
Subject: bugfixes, adjusted famec timing
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faffbf2d80894cfd032889675c2c81c034ee59ad;p=libpicofe.git

bugfixes, adjusted famec timing

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@283 be3aeb3a-fb24-0410-a615-afba39da0efa
---

diff --git a/linux/Makefile b/linux/Makefile
index 90a149c..9dd365f 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,6 +1,7 @@
 
 # settings
 #use_musashi = 1
+use_fame = 1
 #use_mz80 = 1
 
 # profile = 1
@@ -51,22 +52,26 @@ OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
 OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
-else
+endif
+ifeq "$(use_fame)" "1"
 DEFINC += -DEMU_F68K
 OBJS += ../../cpu/fame/famec.o
 endif
 # z80
 ifeq "$(use_mz80)" "1"
-CFLAGS += -D_USE_MZ80
+DEFINC += -D_USE_MZ80
 OBJS += ../../cpu/mz80/mz80.o
 else
-CFLAGS += -D_USE_CZ80
+DEFINC += -D_USE_CZ80
 OBJS += ../../cpu/cz80/cz80.o
 endif
-
-# faked asm
-#DEFINC += -D_ASM_DRAW_C
-#OBJS += fakedasm.o
+# misc
+ifeq "$(use_fame)" "1"
+ifeq "$(use_musashi)" "1"
+OBJS += ../../Pico/Debug.o
+OBJS += ../../cpu/musashi/m68kdasm.o
+endif
+endif
 
 
 all: PicoDrive
@@ -78,8 +83,8 @@ tidy:
 	@make -C ../common/helix/ X86=1 clean
 
 PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
-	@echo $@
-	@$(GCC) $(COPT) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
+	@echo ">>>" $@
+	$(GCC) $(COPT) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
 
 ../../cpu/musashi/m68kops.c :
@@ -96,18 +101,19 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 	@make -C ../common/helix/ X86=1 clean all
 
 .c.o:
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 .s.o:
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
 
 ../../Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
-	@echo $@
-	@$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ # -mtune=arm940t -DEXTERNAL_YM2612
+	@echo ">>>" $@
+	$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@
+
+../../cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -Wno-unused -c $< -o $@
 
-../../cpu/fame/famec.o : ../../cpu/fame/famec.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -Wno-unused -c $< -o $@