amalgamation

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

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 49e1387..f698a8f 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -13,6 +13,7 @@ asm_ym2612 = 1
 asm_misc = 1\r
 asm_cdpico = 1\r
 asm_cdmemory = 1\r
+amalgamate = 1\r
 #profile = 1\r
 #use_musashi = 1\r
 #up = 1\r
@@ -50,14 +51,20 @@ OBJCOPY = $(CROSS)objcopy
 OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
+\r
 # Pico\r
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory.o ../../Pico/Misc.o \\r
+ifeq "$(amalgamate)" "1"\r
+OBJS += ../../PicoAll.o\r
+else\r
+OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \\r
                ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \\r
                ../../Pico/Patch.o\r
 # Pico - CD\r
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \\r
                ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \\r
                ../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o\r
+endif\r
+\r
 # asm stuff\r
 ifeq "$(asm_render)" "1"\r
 DEFINC += -D_ASM_DRAW_C\r
@@ -84,9 +91,13 @@ ifeq "$(asm_cdmemory)" "1"
 DEFINC += -D_ASM_CD_MEMORY_C\r
 OBJS += ../../Pico/cd/memory_asm.o\r
 endif\r
+\r
 # Pico - sound\r
+ifneq "$(amalgamate)" "1"\r
+OBJS += ../../Pico/sound/sound.o\r
+endif\r
 OBJS += ../../Pico/sound/mix_asm.o\r
-OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o\r
+OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o\r
 # zlib\r
 OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \\r
        ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
@@ -217,17 +228,3 @@ rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.tx
 code940/code940.bin:\r
        make -C code940/\r
 \r
-\r
-# test\r
-#usbjoy.o : usbjoy.c\r
-#      @echo $<\r
-#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
-#\r
-#../../Pico/Cart.o : ../../Pico/Cart.c\r
-#      @echo $<\r
-#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
-#\r
-#../../zlib/trees.o : ../../zlib/trees.c\r
-#      @echo $<\r
-#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
-\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 939ba93..a9a931a 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -278,7 +278,7 @@ int emu_ReloadRom(void)
                // bios_help() ?\r
                return 0;\r
        } else {\r
-               if (PicoMCD & 1) PicoExitMCD();\r
+               if (PicoMCD & 1) Stop_CD();\r
                PicoMCD &= ~1;\r
        }\r
 \r

diff --git a/linux/Makefile b/linux/Makefile
index 5c85c5c..a85ef43 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -27,7 +27,7 @@ LDFLAGS += `pkg-config --libs gthread-2.0`
 OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/fonts.o ../gp2x/emu.o ../gp2x/usbjoy.o blit.o \
                gp2x.o 940ctl_ym2612.o ../gp2x/readpng.o
 # Pico
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory.o ../../Pico/Misc.o \
+OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
                ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
                ../../Pico/Patch.o
 # Pico - CD