notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adjustments for CPU core changes
[libpicofe.git]
/
gp2x
/
Makefile
diff --git
a/gp2x/Makefile
b/gp2x/Makefile
index
1654dfa
..
377ea11
100644
(file)
--- a/
gp2x/Makefile
+++ b/
gp2x/Makefile
@@
-21,10
+21,12
@@
asm_cdmemory = 1
ifeq "$(debug_cyclone)" "1"
\r
use_cyclone = 1
\r
use_musashi = 1
\r
ifeq "$(debug_cyclone)" "1"
\r
use_cyclone = 1
\r
use_musashi = 1
\r
+endif
\r
+ifeq "$(use_musashi)" "1"
\r
+asm_cdpico = 0
\r
asm_memory = 0
\r
asm_cdmemory = 0
\r
asm_memory = 0
\r
asm_cdmemory = 0
\r
-endif
\r
-ifneq "$(use_musashi)" "1"
\r
+else
\r
use_cyclone = 1
\r
endif
\r
\r
use_cyclone = 1
\r
endif
\r
\r
@@
-99,8
+101,7
@@
endif
# CPU cores
\r
ifeq "$(use_musashi)" "1"
\r
DEFINC += -DEMU_M68K
\r
# CPU cores
\r
ifeq "$(use_musashi)" "1"
\r
DEFINC += -DEMU_M68K
\r
-OBJS += ../../cpu/musashi/m68kcpu.o ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o
\r
-OBJS += ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o
\r
+OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
\r
endif
\r
ifeq "$(use_cyclone)" "1"
\r
DEFINC += -DEMU_C68K
\r
endif
\r
ifeq "$(use_cyclone)" "1"
\r
DEFINC += -DEMU_C68K
\r
@@
-179,7
+180,11
@@
testrefr.gpe : test.o gp2x.o asmutils.o
# build Cyclone
\r
../../cpu/Cyclone/proj/Cyclone.s :
\r
@echo building Cyclone...
\r
# build Cyclone
\r
../../cpu/Cyclone/proj/Cyclone.s :
\r
@echo building Cyclone...
\r
- @make -C ../../cpu/Cyclone/proj -f Makefile.linux
\r
+ @make -C ../../cpu/Cyclone/proj
\r
+
\r
+../../cpu/musashi/m68kops.c :
\r
+ @make -C ../../cpu/musashi
\r
+
\r
\r
# build helix libs
\r
helix/helix_mp3.a:
\r
\r
# build helix libs
\r
helix/helix_mp3.a:
\r