X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fgp2x%2FMakefile;h=489d62f3dfd299d6296cacbd3e352a673f0abd49;hb=a9b3ffd3cce011d42652d22f15a4a13dff29b0d7;hp=1654dfa64f1d3eeaf1483f06fa59c1a39a30b3ca;hpb=2d0b15bb2c532cacdbc8fcecb915177b1bd5f2af;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 1654dfa..489d62f 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -6,7 +6,7 @@ CROSS = arm-linux-
 
 # settings
 #mz80 = 1
-debug_cyclone = 0
+#debug_cyclone = 1
 asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
@@ -21,10 +21,12 @@ asm_cdmemory = 1
 ifeq "$(debug_cyclone)" "1"
 use_cyclone = 1
 use_musashi = 1
+endif
+ifeq "$(use_musashi)" "1"
+asm_cdpico = 0
 asm_memory = 0
 asm_cdmemory = 0
-endif
-ifneq "$(use_musashi)" "1"
+else
 use_cyclone = 1
 endif
 
@@ -99,8 +101,7 @@ endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kcpu.o ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o
-OBJS += ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o
+OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
 endif
 ifeq "$(use_cyclone)" "1"
 DEFINC += -DEMU_C68K
@@ -179,7 +180,11 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s :
 	@echo building Cyclone...
-	@make -C ../../cpu/Cyclone/proj -f Makefile.linux
+	@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
+
+../../cpu/musashi/m68kops.c :
+	@make -C ../../cpu/musashi
+
 
 # build helix libs
 helix/helix_mp3.a:
@@ -205,7 +210,7 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/code940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png
+rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png
 	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
 
 code940/code940.bin: