lowercasing filenames, part1; makefile adjustments

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

diff --git a/Pico/Pico/Memory.c b/Pico/Pico/memory.c
similarity index 99%
rename from Pico/Pico/Memory.c
rename to Pico/Pico/memory.c
index 13cff62..f124a06 100644 (file)
--- a/Pico/Pico/Memory.c
+++ b/Pico/Pico/memory.c
@@ -1,4 +1,4 @@
-#include "../PicoInt.h"
+#include "../pico_int.h"
 #include "../sound/sn76496.h"
 
 #ifndef UTYPES_DEFINED

diff --git a/Pico/Pico/Pico.c b/Pico/Pico/pico.c
similarity index 99%
rename from Pico/Pico/Pico.c
rename to Pico/Pico/pico.c
index fcec65f..298e57e 100644 (file)
--- a/Pico/Pico/Pico.c
+++ b/Pico/Pico/pico.c
@@ -1,4 +1,4 @@
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 // x: 0x03c - 0x19d
 // y: 0x1fc - 0x2f7

diff --git a/Pico/Pico/xpcm.c b/Pico/Pico/xpcm.c
index 5fe9830..da3f480 100644 (file)
--- a/Pico/Pico/xpcm.c
+++ b/Pico/Pico/xpcm.c
@@ -4,7 +4,7 @@
  * best sounding of the ones that I tried.
  */
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 #define ADPCMSHIFT      8
 #define ADFIX(f)        (int) ((double)f * (double)(1<<ADPCMSHIFT))

diff --git a/Pico/Area.c b/Pico/area.c
similarity index 96%
rename from Pico/Area.c
rename to Pico/area.c
index 35f28c2..876320d 100644 (file)
--- a/Pico/Area.c
+++ b/Pico/area.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 // ym2612\r
 #include "sound/ym2612.h"\r

diff --git a/Pico/Cart.c b/Pico/cart.c
similarity index 96%
rename from Pico/Cart.c
rename to Pico/cart.c
index c07bfda..ad15ab9 100644 (file)
--- a/Pico/Cart.c
+++ b/Pico/cart.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 #include "../zlib/zlib.h"\r
 #include "../unzip/unzip.h"\r
 #include "../unzip/unzip_stream.h"\r

diff --git a/Pico/carthw/carthw.c b/Pico/carthw/carthw.c
index eb71bbe..19bd031 100644 (file)
--- a/Pico/carthw/carthw.c
+++ b/Pico/carthw/carthw.c
@@ -9,7 +9,7 @@
  * while the game runs, memcpy will suffice.
  */
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 
 /* 12-in-1 and 4-in-1. Assuming >= 2MB ROMs here. */

diff --git a/Pico/carthw/svp/compiler.c b/Pico/carthw/svp/compiler.c
index d163eb4..527077d 100644 (file)
--- a/Pico/carthw/svp/compiler.c
+++ b/Pico/carthw/svp/compiler.c
@@ -3,7 +3,7 @@
 // (c) Copyright 2008, Grazvydas "notaz" Ignotas
 // Free for non-commercial use.
 
-#include "../../PicoInt.h"
+#include "../../pico_int.h"
 #include "compiler.h"
 
 #define u32 unsigned int

diff --git a/Pico/carthw/svp/Memory.c b/Pico/carthw/svp/memory.c
similarity index 98%
rename from Pico/carthw/svp/Memory.c
rename to Pico/carthw/svp/memory.c
index e835d32..7f182fe 100644 (file)
--- a/Pico/carthw/svp/Memory.c
+++ b/Pico/carthw/svp/memory.c
@@ -6,8 +6,7 @@
 // For commercial use, separate licencing terms must be obtained.
 
 
-#include "../../PicoInt.h"
-#include "../../PicoInt.h"
+#include "../../pico_int.h"
 
 #ifndef UTYPES_DEFINED
 typedef unsigned char  u8;

diff --git a/Pico/carthw/svp/ssp16.c b/Pico/carthw/svp/ssp16.c
index feef99b..1d59406 100644 (file)
--- a/Pico/carthw/svp/ssp16.c
+++ b/Pico/carthw/svp/ssp16.c
@@ -12,8 +12,6 @@
  * Useful for homebrew or if a new VR revision pops up. */
 //#define DO_CHECKS
 
-#include "../../PicoInt.h"
-
 /*
  * Register info
  *
@@ -188,7 +186,7 @@
  *   ops not used by VR are not implemented
  */
 
-#include "../../PicoInt.h"
+#include "../../pico_int.h"
 
 #define u32 unsigned int
 

diff --git a/Pico/carthw/svp/svp.c b/Pico/carthw/svp/svp.c
index 4e01a92..be9414e 100644 (file)
--- a/Pico/carthw/svp/svp.c
+++ b/Pico/carthw/svp/svp.c
@@ -6,7 +6,7 @@
 // For commercial use, separate licencing terms must be obtained.
 
 
-#include "../../PicoInt.h"
+#include "../../pico_int.h"
 #include "compiler.h"
 #ifdef __GP2X__
 #include <sys/mman.h>

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index efad005..8a42ee5 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -7,7 +7,7 @@
  *                                                         *\r
  ***********************************************************/\r
 \r
-#include "../PicoInt.h"\r
+#include "../pico_int.h"\r
 \r
 #define CDC_DMA_SPEED 256\r
 \r

diff --git a/Pico/cd/Area.c b/Pico/cd/area.c
similarity index 99%
rename from Pico/cd/Area.c
rename to Pico/cd/area.c
index 164d272..88fe882 100644 (file)
--- a/Pico/cd/Area.c
+++ b/Pico/cd/area.c
@@ -2,7 +2,7 @@
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 // ym2612
 #include "../sound/ym2612.h"

diff --git a/Pico/cd/buffering.c b/Pico/cd/buffering.c
index e0e888d..dbf7b28 100644 (file)
--- a/Pico/cd/buffering.c
+++ b/Pico/cd/buffering.c
@@ -1,7 +1,7 @@
 // Buffering handling
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 int PicoCDBuffers = 0;
 static unsigned char *cd_buffer = NULL;

diff --git a/Pico/cd/cd_file.c b/Pico/cd/cd_file.c
index 1fdbef6..f5d8744 100644 (file)
--- a/Pico/cd/cd_file.c
+++ b/Pico/cd/cd_file.c
@@ -7,7 +7,7 @@
  *                                                         *
  ***********************************************************/
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 #include "cd_file.h"
 #include "cue.h"
 

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 03bf0d2..319f4f1 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -9,7 +9,7 @@
 \r
 #include <stdio.h>\r
 \r
-#include "../PicoInt.h"\r
+#include "../pico_int.h"\r
 #include "cd_sys.h"\r
 #include "cd_file.h"\r
 \r

diff --git a/Pico/cd/cd_sys.h b/Pico/cd/cd_sys.h
index 6725efc..fcac1d8 100644 (file)
--- a/Pico/cd/cd_sys.h
+++ b/Pico/cd/cd_sys.h
@@ -72,7 +72,7 @@ typedef struct {
 PICO_INTERNAL void LBA_to_MSF(int lba, _msf *MSF);\r
 PICO_INTERNAL int  Track_to_LBA(int track);\r
 \r
-// moved to Pico.h\r
+// moved to pico.h\r
 // int  Insert_CD(char *iso_name, int is_bin);\r
 // void Stop_CD(void);\r
 \r

diff --git a/Pico/cd/cue.c b/Pico/cd/cue.c
index 9d0b498..ab09c10 100644 (file)
--- a/Pico/cd/cue.c
+++ b/Pico/cd/cue.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include "cue.h"
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 // #define elprintf(w,f,...) printf(f "\n",##__VA_ARGS__);
 
 #ifdef _MSC_VER

diff --git a/Pico/cd/gfx_cd.c b/Pico/cd/gfx_cd.c
index 02072c3..69d4a00 100644 (file)
--- a/Pico/cd/gfx_cd.c
+++ b/Pico/cd/gfx_cd.c
@@ -5,7 +5,7 @@
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 #define _rot_comp Pico_mcd->rot_comp
 

diff --git a/Pico/cd/Memory.c b/Pico/cd/memory.c
similarity index 96%
rename from Pico/cd/Memory.c
rename to Pico/cd/memory.c
index 9f61975..593a4cb 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/memory.c
@@ -3,7 +3,7 @@
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas\r
 \r
 \r
-#include "../PicoInt.h"\r
+#include "../pico_int.h"\r
 \r
 #include "../sound/ym2612.h"\r
 #include "../sound/sn76496.h"\r
@@ -452,7 +452,7 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
 #ifndef _ASM_CD_MEMORY_C\r
 #define _CD_MEMORY_C\r
 #undef _ASM_MEMORY_C\r
-#include "../MemoryCmn.c"\r
+#include "../memory_cmn.c"\r
 #include "cell_map.c"\r
 #endif\r
 \r

diff --git a/Pico/cd/Memory.s b/Pico/cd/memory_arm.s
similarity index 100%
rename from Pico/cd/Memory.s
rename to Pico/cd/memory_arm.s

diff --git a/Pico/cd/Misc.c b/Pico/cd/misc.c
similarity index 98%
rename from Pico/cd/Misc.c
rename to Pico/cd/misc.c
index 74beade..c3dcf69 100644 (file)
--- a/Pico/cd/Misc.c
+++ b/Pico/cd/misc.c
@@ -1,7 +1,7 @@
 // Some misc stuff
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 unsigned char formatted_bram[4*0x10] =
 {

diff --git a/Pico/cd/Misc.s b/Pico/cd/misc_arm.s
similarity index 100%
rename from Pico/cd/Misc.s
rename to Pico/cd/misc_arm.s

diff --git a/Pico/cd/pcm.c b/Pico/cd/pcm.c
index 7bd8685..9217d37 100644 (file)
--- a/Pico/cd/pcm.c
+++ b/Pico/cd/pcm.c
@@ -2,7 +2,7 @@
 // Based on Gens code by Stéphane Dallongeville
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 #include "pcm.h"
 
 static unsigned int g_rate = 0; // 18.14 fixed point

diff --git a/Pico/cd/Pico.c b/Pico/cd/pico.c
similarity index 99%
rename from Pico/cd/Pico.c
rename to Pico/cd/pico.c
index 3ab0fe3..33899e4 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/pico.c
@@ -1,7 +1,7 @@
 // (c) Copyright 2007 notaz, All rights reserved.
 
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 #include "../sound/ym2612.h"
 
 extern unsigned char formatted_bram[4*0x10];
@@ -235,7 +235,7 @@ static __inline void getSamples(int y)
 
 
 #define PICO_CD
-#include "../PicoFrameHints.c"
+#include "../pico_cmn.c"
 
 
 PICO_INTERNAL void PicoFrameMCD(void)

diff --git a/Pico/cd/Pico.s b/Pico/cd/pico_arm.s
similarity index 100%
rename from Pico/cd/Pico.s
rename to Pico/cd/pico_arm.s

diff --git a/Pico/cd/Sek.c b/Pico/cd/sek.c
similarity index 99%
rename from Pico/cd/Sek.c
rename to Pico/cd/sek.c
index 24844d8..3a7b1d6 100644 (file)
--- a/Pico/cd/Sek.c
+++ b/Pico/cd/sek.c
@@ -1,7 +1,7 @@
 // (c) Copyright 2007 notaz, All rights reserved.
 
 
-#include "../PicoInt.h"
+#include "../pico_int.h"
 
 
 int SekCycleCntS68k=0; // cycles done in this frame

diff --git a/Pico/Debug.c b/Pico/debug.c
similarity index 99%
rename from Pico/Debug.c
rename to Pico/debug.c
index b2efa4d..ac687f0 100644 (file)
--- a/Pico/Debug.c
+++ b/Pico/debug.c
@@ -1,8 +1,8 @@
 // some debug code, just for fun of it
 // (c) Copyright 2008 notaz, All rights reserved.
 
-#include "PicoInt.h"
-#include "Debug.h"
+#include "pico_int.h"
+#include "debug.h"
 
 #define bit(r, x) ((r>>x)&1)
 #define MVP dstrp+=strlen(dstrp)

diff --git a/Pico/Debug.h b/Pico/debug.h
similarity index 100%
rename from Pico/Debug.h
rename to Pico/debug.h

diff --git a/Pico/DebugCPU.c b/Pico/debugCPU.c
similarity index 96%
rename from Pico/DebugCPU.c
rename to Pico/debugCPU.c
index 45ba08b..77ca420 100644 (file)
--- a/Pico/DebugCPU.c
+++ b/Pico/debugCPU.c
@@ -1,4 +1,4 @@
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 typedef unsigned char  u8;\r
 \r

diff --git a/Pico/Draw.c b/Pico/draw.c
similarity index 96%
rename from Pico/Draw.c
rename to Pico/draw.c
index 15d0992..551b3d6 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/draw.c
@@ -18,7 +18,7 @@
  * AS is enabled by user and takes priority over "sonic mode".\r
  */\r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 int (*PicoScanBegin)(unsigned int num) = NULL;\r
 int (*PicoScanEnd)  (unsigned int num) = NULL;\r

diff --git a/Pico/Draw2.c b/Pico/draw2.c
similarity index 96%
rename from Pico/Draw2.c
rename to Pico/draw2.c
index 054cee9..b2e6a71 100644 (file)
--- a/Pico/Draw2.c
+++ b/Pico/draw2.c
@@ -9,7 +9,7 @@
 // this is a frame-based renderer, alternative to Dave's line based which is in Draw.c\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 // port_config.h include must define these 2 defines:\r
 // #define START_ROW  1 // which row of tiles to start rendering at?\r

diff --git a/Pico/Draw2.s b/Pico/draw2_arm.s
similarity index 100%
rename from Pico/Draw2.s
rename to Pico/draw2_arm.s

diff --git a/Pico/Draw_amips.s b/Pico/draw_amips.s
similarity index 100%
rename from Pico/Draw_amips.s
rename to Pico/draw_amips.s

diff --git a/Pico/Draw.s b/Pico/draw_arm.s
similarity index 100%
rename from Pico/Draw.s
rename to Pico/draw_arm.s

diff --git a/Pico/Memory.c b/Pico/memory.c
similarity index 96%
rename from Pico/Memory.c
rename to Pico/memory.c
index 8975fa2..074af24 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/memory.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 #include "sound/ym2612.h"\r
 #include "sound/sn76496.h"\r
@@ -317,7 +317,7 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
     Pico.m.prot_bytes[(a>>2)&1] = (u8)d;\r
 }\r
 \r
-#include "MemoryCmn.c"\r
+#include "memory_cmn.c"\r
 \r
 \r
 // -----------------------------------------------------------------\r

diff --git a/Pico/Memory_amips.s b/Pico/memory_amips.s
similarity index 100%
rename from Pico/Memory_amips.s
rename to Pico/memory_amips.s

diff --git a/Pico/Memory.s b/Pico/memory_arm.s
similarity index 100%
rename from Pico/Memory.s
rename to Pico/memory_arm.s

diff --git a/Pico/MemoryCmn.c b/Pico/memory_cmn.c
similarity index 100%
rename from Pico/MemoryCmn.c
rename to Pico/memory_cmn.c

diff --git a/Pico/Misc.c b/Pico/misc.c
similarity index 97%
rename from Pico/Misc.c
rename to Pico/misc.c
index 944e4c8..014ffa1 100644 (file)
--- a/Pico/Misc.c
+++ b/Pico/misc.c
@@ -6,7 +6,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 // H-counter table for hvcounter reads in 40col mode\r
 // based on Gens code\r

diff --git a/Pico/Misc_amips.s b/Pico/misc_amips.s
similarity index 100%
rename from Pico/Misc_amips.s
rename to Pico/misc_amips.s

diff --git a/Pico/Misc.s b/Pico/misc_arm.s
similarity index 100%
rename from Pico/Misc.s
rename to Pico/misc_arm.s

diff --git a/Pico/Patch.c b/Pico/patch.c
similarity index 99%
rename from Pico/Patch.c
rename to Pico/patch.c
index e57d83f..42c6a4e 100644 (file)
--- a/Pico/Patch.c
+++ b/Pico/patch.c
@@ -25,8 +25,8 @@
 //#include <string.h>
 #include <ctype.h>
 
-#include "PicoInt.h"
-#include "Patch.h"
+#include "pico_int.h"
+#include "patch.h"
 
 struct patch
 {

diff --git a/Pico/Patch.h b/Pico/patch.h
similarity index 100%
rename from Pico/Patch.h
rename to Pico/patch.h

diff --git a/Pico/Pico.c b/Pico/pico.c
similarity index 92%
rename from Pico/Pico.c
rename to Pico/pico.c
index 296d5d5..08ba510 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/pico.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 #include "sound/ym2612.h"\r
 \r
 int PicoVer=0x0133;\r
@@ -287,9 +287,7 @@ static __inline void getSamples(int y)
 #endif\r
 }\r
 \r
-\r
-#include "PicoFrameHints.c"\r
-\r
+#include "pico_cmn.c"\r
 \r
 int z80stopCycle;\r
 int z80_cycle_cnt;        /* 'done' z80 cycles before z80_run() */\r
@@ -316,21 +314,6 @@ void PicoFrame(void)
 {\r
   Pico.m.frame_count++;\r
 \r
-#if 0\r
-  if ((Pico.m.frame_count & 0x3f) == 0)\r
-  {\r
-    extern int idlehit_addrs[], idlehit_counts[];\r
-    int i;\r
-    printf("--\n");\r
-    for (i = 0; i < 128 && idlehit_addrs[i] != 0; i++) {\r
-      if (idlehit_counts[i] != 0) {\r
-        printf("%06x %i %i\n", idlehit_addrs[i], idlehit_counts[i],  idlehit_counts[i] >> 6);\r
-        idlehit_counts[i] = 0;\r
-      }\r
-    }\r
-  }\r
-#endif\r
-\r
   if (PicoAHW & PAHW_MCD) {\r
     PicoFrameMCD();\r
     return;\r

diff --git a/Pico/Pico.h b/Pico/pico.h
similarity index 100%
rename from Pico/Pico.h
rename to Pico/pico.h

diff --git a/Pico/PicoFrameHints.c b/Pico/pico_cmn.c
similarity index 100%
rename from Pico/PicoFrameHints.c
rename to Pico/pico_cmn.c

diff --git a/Pico/PicoInt.h b/Pico/pico_int.h
similarity index 96%
rename from Pico/PicoInt.h
rename to Pico/pico_int.h
index d0fc25c..a7ea5e8 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/pico_int.h
@@ -12,7 +12,7 @@
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
-#include "Pico.h"\r
+#include "pico.h"\r
 #include "carthw/carthw.h"\r
 \r
 //\r

diff --git a/Pico/Sek.c b/Pico/sek.c
similarity index 95%
rename from Pico/Sek.c
rename to Pico/sek.c
index f72da65..f085f61 100644 (file)
--- a/Pico/Sek.c
+++ b/Pico/sek.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 \r
 int SekCycleCnt=0; // cycles done in this frame\r

diff --git a/Pico/sound/mix.s b/Pico/sound/mix_arm.s
similarity index 100%
rename from Pico/sound/mix.s
rename to Pico/sound/mix_arm.s

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index cfa21a4..39ae291 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -10,8 +10,7 @@
 #include <string.h>\r
 #include "ym2612.h"\r
 #include "sn76496.h"\r
-\r
-#include "../PicoInt.h"\r
+#include "../pico_int.h"\r
 #include "../cd/pcm.h"\r
 #include "mix.h"\r
 \r

diff --git a/Pico/sound/ym2612.s b/Pico/sound/ym2612_arm.s
similarity index 100%
rename from Pico/sound/ym2612.s
rename to Pico/sound/ym2612_arm.s

diff --git a/Pico/Utils.c b/Pico/utils.c
similarity index 94%
rename from Pico/Utils.c
rename to Pico/utils.c
index 22bd3ac..467bc78 100644 (file)
--- a/Pico/Utils.c
+++ b/Pico/utils.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 \r
 int PicuAnd=0xf7de;\r
 \r

diff --git a/Pico/VideoPort.c b/Pico/videoport.c
similarity index 96%
rename from Pico/VideoPort.c
rename to Pico/videoport.c
index 6aabe88..3d74f51 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/videoport.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-#include "PicoInt.h"\r
+#include "pico_int.h"\r
 #include "cd/gfx_cd.h"\r
 \r
 extern const unsigned char  hcounts_32[];\r

diff --git a/cpu/cz80/cz80.c b/cpu/cz80/cz80.c
index 20e8053..374325e 100644 (file)
--- a/cpu/cz80/cz80.c
+++ b/cpu/cz80/cz80.c
@@ -15,7 +15,7 @@
 \r
 #if PICODRIVE_HACKS\r
 #undef EMU_M68K\r
-#include <Pico/PicoInt.h>\r
+#include <pico/pico_int.h>\r
 #endif\r
 \r
 #ifndef ALIGN_DATA\r

diff --git a/platform/common/common_arm.mak b/platform/common/common_arm.mak
index 5308fb3..ec0c65a 100644 (file)
--- a/platform/common/common_arm.mak
+++ b/platform/common/common_arm.mak
@@ -1,3 +1,31 @@
+# asm stuff
+ifeq "$(asm_render)" "1"
+DEFINC += -D_ASM_DRAW_C
+OBJS += pico/draw_arm.o pico/draw2_arm.o
+endif
+ifeq "$(asm_memory)" "1"
+DEFINC += -D_ASM_MEMORY_C
+OBJS += pico/memory_arm.o
+endif
+ifeq "$(asm_ym2612)" "1"
+DEFINC += -D_ASM_YM2612_C
+OBJS += pico/sound/ym2612_arm.o
+endif
+ifeq "$(asm_misc)" "1"
+DEFINC += -D_ASM_MISC_C
+OBJS += pico/misc_arm.o
+OBJS += pico/cd/misc_arm.o
+endif
+ifeq "$(asm_cdpico)" "1"
+DEFINC += -D_ASM_CD_PICO_C
+OBJS += pico/cd/pico_arm.o
+endif
+ifeq "$(asm_cdmemory)" "1"
+DEFINC += -D_ASM_CD_MEMORY_C
+OBJS += pico/cd/memory_arm.o
+endif
+
+
 .c.o:
        @echo ">>>" $<
        $(CC) $(CFLAGS) $(DEFINC) -c $< -o $@
@@ -18,47 +46,18 @@ mkdirs:
        mkdir -p $(DIRS)
 
 # deps
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
-Pico/Pico.o Pico/cd/Pico.o : ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
-Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
-
-# individual rules
-Pico/draw_asm.o : ../../Pico/Draw.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/draw2_asm.o : ../../Pico/Draw2.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/memory_asm.o : ../../Pico/Memory.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/misc_asm.o : ../../Pico/Misc.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-#Pico/carthw/svp/stub_arm.o : ../../Pico/carthw/svp/stub_arm.S
-#      @echo ">>>" $@
-#      $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@
+pico/carthw/svp/compiler.o : ../../pico/carthw/svp/ssp16.o ../../pico/carthw/svp/gen_arm.c
+pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
 
 # build Cyclone
 cpu/Cyclone/proj/Cyclone.s:
        @echo building Cyclone...
        @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
 
+../../cpu/musashi/m68kops.c :
+       @make -C ../../cpu/musashi
+
 # build helix libs
 ../common/helix/$(CROSS)helix-mp3.a:
        make -C ../common/helix clean all

diff --git a/platform/common/config.c b/platform/common/config.c
index c530c95..2704aca 100644 (file)
--- a/platform/common/config.c
+++ b/platform/common/config.c
@@ -18,7 +18,7 @@ static char *mystrip(char *str);
 
 #include "menu.h"
 #include "emu.h"
-#include <Pico/Pico.h>
+#include <pico/pico.h>
 
 extern menu_entry opt_entries[];
 extern menu_entry opt2_entries[];

diff --git a/platform/common/emu.c b/platform/common/emu.c
index eaabe08..73ca01b 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -17,9 +17,9 @@
 #include "config.h"\r
 #include "common.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/cd/cue.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/cd/cue.h>\r
 #include <zlib/zlib.h>\r
 \r
 \r

diff --git a/platform/common/menu.c b/platform/common/menu.c
index 169b892..1becb83 100644 (file)
--- a/platform/common/menu.c
+++ b/platform/common/menu.c
@@ -338,8 +338,8 @@ int me_process(menu_entry *entries, int count, menu_id id, int is_next)
 #include <sys/stat.h>\r
 #include <sys/types.h>\r
 \r
-#include <Pico/Pico.h>\r
-#include <Pico/Debug.h>\r
+#include <pico/pico.h>\r
+#include <pico/debug.h>\r
 \r
 void SekStepM68k(void);\r
 \r

diff --git a/platform/common/mp3_helix.c b/platform/common/mp3_helix.c
index f28abda..718c3de 100644 (file)
--- a/platform/common/mp3_helix.c
+++ b/platform/common/mp3_helix.c
@@ -6,8 +6,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/sound/mix.h"
+#include "../../pico/pico_int.h"
+#include "../../pico/sound/mix.h"
 #include "helix/pub/mp3dec.h"
 #include "lprintf.h"
 

diff --git a/platform/gizmondo/Makefile b/platform/gizmondo/Makefile
index 0e37e2d..1a2c63a 100644 (file)
--- a/platform/gizmondo/Makefile
+++ b/platform/gizmondo/Makefile
@@ -44,54 +44,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
-OBJS += PicoAll.o\r
+OBJS += picoAll.o\r
 else\r
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
-               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \\r
+               pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.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 Pico/cd/cue.o \\r
-               Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\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 pico/cd/cue.o \\r
+               pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o\r
 endif\r
 # Pico - Pico\r
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
 # Pico - carthw\r
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
-               Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o\r
-\r
-# asm stuff\r
-ifeq "$(asm_render)" "1"\r
-DEFINC += -D_ASM_DRAW_C\r
-OBJS += Pico/draw_asm.o Pico/draw2_asm.o\r
-endif\r
-ifeq "$(asm_memory)" "1"\r
-DEFINC += -D_ASM_MEMORY_C\r
-OBJS += Pico/memory_asm.o\r
-endif\r
-ifeq "$(asm_ym2612)" "1"\r
-DEFINC += -D_ASM_YM2612_C\r
-OBJS += Pico/sound/ym2612_asm.o\r
-endif\r
-ifeq "$(asm_misc)" "1"\r
-DEFINC += -D_ASM_MISC_C\r
-OBJS += Pico/misc_asm.o\r
-OBJS += Pico/cd/misc_asm.o\r
-endif\r
-ifeq "$(asm_cdpico)" "1"\r
-DEFINC += -D_ASM_CD_PICO_C\r
-OBJS += Pico/cd/pico_asm.o\r
-endif\r
-ifeq "$(asm_cdmemory)" "1"\r
-DEFINC += -D_ASM_CD_MEMORY_C\r
-OBJS += Pico/cd/memory_asm.o\r
-endif\r
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
+               pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
 \r
 # Pico - sound\r
 ifneq "$(amalgamate)" "1"\r
-OBJS += Pico/sound/sound.o\r
+OBJS += pico/sound/sound.o\r
 endif\r
-OBJS += Pico/sound/mix_asm.o\r
-OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
+OBJS += pico/sound/mix_asm.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
@@ -108,7 +81,7 @@ OBJS += cpu/DrZ80/drz80.o
 vpath %.c = ../..\r
 vpath %.s = ../..\r
 vpath %.S = ../..\r
-DIRS = platform platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+DIRS = platform platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
        zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
 \r
 \r

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index ee5a105..9f08f06 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -16,7 +16,7 @@
 #include "giz.h"
 #include "asm_utils.h"
 
-#include <Pico/PicoInt.h>
+#include <pico/pico_int.h>
 
 #ifdef BENCHMARK
 #define OSD_FPS_X 220

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index 50de347..edd7ef0 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -26,8 +26,8 @@
 #include "../common/readpng.h"\r
 #include "version.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
 #include <zlib/zlib.h>\r
 \r
 \r

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index f01ffa3..1c6e4ca 100644 (file)
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -18,9 +18,9 @@
 #include "../common/arm_utils.h"\r
 #include "../common/menu.h"\r
 #include "../common/emu.h"\r
-#include "../../Pico/PicoInt.h"\r
-#include "../../Pico/sound/ym2612.h"\r
-#include "../../Pico/sound/mix.h"\r
+#include "../../pico/pico_int.h"\r
+#include "../../pico/sound/ym2612.h"\r
+#include "../../pico/sound/mix.h"\r
 \r
 /* we will need some gp2x internals here */\r
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */\r

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 06761a3..b8bf448 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -64,54 +64,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += ../../picoAll.o\r
 else\r
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
-               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \\r
+               pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.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/cue.o Pico/cd/gfx_cd.o \\r
-               Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\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/cue.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
 # Pico - Pico\r
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
 # Pico - carthw\r
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
-               Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o\r
-\r
-# asm stuff\r
-ifeq "$(asm_render)" "1"\r
-DEFINC += -D_ASM_DRAW_C\r
-OBJS += Pico/draw_asm.o Pico/draw2_asm.o\r
-endif\r
-ifeq "$(asm_memory)" "1"\r
-DEFINC += -D_ASM_MEMORY_C\r
-OBJS += Pico/memory_asm.o\r
-endif\r
-ifeq "$(asm_ym2612)" "1"\r
-DEFINC += -D_ASM_YM2612_C\r
-OBJS += Pico/sound/ym2612_asm.o\r
-endif\r
-ifeq "$(asm_misc)" "1"\r
-DEFINC += -D_ASM_MISC_C\r
-OBJS += Pico/misc_asm.o\r
-OBJS += Pico/cd/misc_asm.o\r
-endif\r
-ifeq "$(asm_cdpico)" "1"\r
-DEFINC += -D_ASM_CD_PICO_C\r
-OBJS += Pico/cd/pico_asm.o\r
-endif\r
-ifeq "$(asm_cdmemory)" "1"\r
-DEFINC += -D_ASM_CD_MEMORY_C\r
-OBJS += Pico/cd/memory_asm.o\r
-endif\r
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
+               pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
 \r
 # Pico - sound\r
 ifneq "$(amalgamate)" "1"\r
-OBJS += Pico/sound/sound.o\r
+OBJS += pico/sound/sound.o\r
 endif\r
-OBJS += Pico/sound/mix_asm.o\r
-OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
+OBJS += pico/sound/mix_arm.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
@@ -119,7 +92,7 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
-OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
+OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
 endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
@@ -142,12 +115,14 @@ endif
 vpath %.c = ../..\r
 vpath %.s = ../..\r
 vpath %.S = ../..\r
-DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
        zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
 \r
 \r
 all: mkdirs PicoDrive.gpe\r
 \r
+include ../common/common_arm.mak\r
+\r
 PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
        $(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
@@ -158,22 +133,14 @@ endif
 up: PicoDrive.gpe\r
        @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
 \r
-#      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
-\r
-# cleanup\r
 clean: tidy\r
        $(RM) PicoDrive.gpe\r
 tidy:\r
        $(RM) $(OBJS)\r
-#      rm -rf $(DIRS) # don't clean, gcda may be there\r
-#      @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
-\r
 \r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ GP2X\r
 \r
-include ../common/common_arm.mak\r
-\r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
 ifeq ($(VER),)\r

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index dc78521..77bd83e 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -24,9 +24,9 @@
 #include "../common/config.h"\r
 #include "cpuctrl.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/sound/mix.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/sound/mix.h>\r
 #include <zlib/zlib.h>\r
 \r
 //#define PFRAMES\r

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index b7bd3f1..e37c878 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -20,8 +20,8 @@
 #include "../common/readpng.h"\r
 #include "version.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
 #include <zlib/zlib.h>\r
 \r
 #ifndef _DIRENT_HAVE_D_TYPE\r

diff --git a/platform/linux/940ctl_ym2612.c b/platform/linux/940ctl_ym2612.c
index b6b593a..9d7e38d 100644 (file)
--- a/platform/linux/940ctl_ym2612.c
+++ b/platform/linux/940ctl_ym2612.c
@@ -8,13 +8,13 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "../../Pico/sound/ym2612.h"
+#include "../../pico/sound/ym2612.h"
 #include "../gp2x/gp2x.h"
 #include "../gp2x/emu.h"
 #include "../gp2x/menu.h"
 #include "../gp2x/code940/940shared.h"
 #include "../common/helix/pub/mp3dec.h"
-#include "../../Pico/PicoInt.h"
+#include "../../pico/pico_int.h"
 
 
 // static _940_data_t  shared_data_;

diff --git a/platform/linux/Makefile b/platform/linux/Makefile
index 5b33ba3..442b50a 100644 (file)
--- a/platform/linux/Makefile
+++ b/platform/linux/Makefile
@@ -35,19 +35,19 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/config.o pl
                platform/common/readpng.o platform/common/mp3_helix.o
 
 # Pico
-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/Debug.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/debug.o
 # Pico - CD
-OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \
-               Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \
-               Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o
+OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
+               pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
+               pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
 # Pico - Pico
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - sound
-OBJS += Pico/sound/sound.o Pico/sound/sn76496.o Pico/sound/ym2612.o Pico/sound/mix.o
+OBJS += pico/sound/sound.o pico/sound/sn76496.o pico/sound/ym2612.o pico/sound/mix.o
 # Pico - carthw
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \
-               Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \
+               pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o
 # zlib
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
        zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o
@@ -73,13 +73,14 @@ endif
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
-OBJS += Pico/DebugCPU.o
+OBJS += pico/debugCPU.o
 OBJS += cpu/musashi/m68kdasm.o
 endif
 endif
+OBJS += cpu/musashi/m68kdasm.o
 
 vpath %.c = ../..
-DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
+DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
        zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
 
 all: mkdirs PicoDrive
@@ -98,9 +99,9 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 mkdirs:
        mkdir -p $(DIRS)
 
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/gen_arm.c
-Pico/Pico.o Pico/cd/Pico.o : ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
-Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
+pico/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
+pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
 
 ../../cpu/musashi/m68kops.c :
        @make -C ../../cpu/musashi
@@ -123,7 +124,7 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
        $(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
 
-Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
+pico/sound/ym2612.o : ../../pico/sound/ym2612.c
        @echo ">>>" $@
        $(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@
 

diff --git a/platform/pandora/Makefile b/platform/pandora/Makefile
index 9cd4e1f..50c34d6 100644 (file)
--- a/platform/pandora/Makefile
+++ b/platform/pandora/Makefile
@@ -41,9 +41,10 @@ endif
 ifeq "$(profile)" "2"\r
 COPT_COMMON += -fprofile-use\r
 endif\r
-COPT = $(COPT_COMMON)\r
-ASOPT =\r
-GCC = $(CROSS)gcc\r
+CFLAGS = $(COPT_COMMON)\r
+SFLAGS = $(CFLAGS)\r
+ASFLAGS = -mcpu=cortex-a8\r
+CC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
 LD = $(CROSS)ld\r
@@ -58,54 +59,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += ../../picoAll.o\r
 else\r
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
-               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \\r
+               pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.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/cue.o Pico/cd/gfx_cd.o \\r
-               Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\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/cue.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
 # Pico - Pico\r
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
 # Pico - carthw\r
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
-               Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o\r
-\r
-# asm stuff\r
-ifeq "$(asm_render)" "1"\r
-DEFINC += -D_ASM_DRAW_C\r
-OBJS += Pico/draw_asm.o Pico/draw2_asm.o\r
-endif\r
-ifeq "$(asm_memory)" "1"\r
-DEFINC += -D_ASM_MEMORY_C\r
-OBJS += Pico/memory_asm.o\r
-endif\r
-ifeq "$(asm_ym2612)" "1"\r
-DEFINC += -D_ASM_YM2612_C\r
-OBJS += Pico/sound/ym2612_asm.o\r
-endif\r
-ifeq "$(asm_misc)" "1"\r
-DEFINC += -D_ASM_MISC_C\r
-OBJS += Pico/misc_asm.o\r
-OBJS += Pico/cd/misc_asm.o\r
-endif\r
-ifeq "$(asm_cdpico)" "1"\r
-DEFINC += -D_ASM_CD_PICO_C\r
-OBJS += Pico/cd/pico_asm.o\r
-endif\r
-ifeq "$(asm_cdmemory)" "1"\r
-DEFINC += -D_ASM_CD_MEMORY_C\r
-OBJS += Pico/cd/memory_asm.o\r
-endif\r
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
+               pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
 \r
 # Pico - sound\r
 ifneq "$(amalgamate)" "1"\r
-OBJS += Pico/sound/sound.o\r
+OBJS += pico/sound/sound.o\r
 endif\r
-OBJS += Pico/sound/mix_asm.o\r
-OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
+OBJS += pico/sound/mix_arm.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
@@ -113,7 +87,7 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
-OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
+OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
 endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
@@ -145,99 +119,29 @@ endif
 vpath %.c = ../..\r
 vpath %.s = ../..\r
 vpath %.S = ../..\r
-DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
        zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
 \r
 \r
 all: mkdirs PicoDrive\r
 \r
+include ../common/common_arm.mak\r
+\r
 PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
-       $(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng\r
+       $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map # -lpng\r
 ifeq ($(DEBUG),)\r
        $(STRIP) $@\r
 endif\r
 \r
-\r
-# cleanup\r
 clean: tidy\r
        $(RM) PicoDrive\r
 tidy:\r
        $(RM) $(OBJS)\r
-#      rm -rf $(DIRS) # don't clean, gcda may be there\r
-#      @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
-\r
-\r
-clean_prof:\r
-       find ../.. -name '*.gcno' -delete\r
-       find ../.. -name '*.gcda' -delete\r
-\r
-\r
-mkdirs:\r
-       mkdir -p $(DIRS)\r
-\r
-.c.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-.s.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-.S.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-\r
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c\r
-\r
-Pico/draw_asm.o : ../../Pico/Draw.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/draw2_asm.o : ../../Pico/Draw2.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/memory_asm.o : ../../Pico/Memory.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/misc_asm.o : ../../Pico/Misc.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-\r
-# build Cyclone\r
-../../cpu/Cyclone/proj/Cyclone.s :\r
-       @echo building Cyclone...\r
-       @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
-\r
-../../cpu/musashi/m68kops.c :\r
-       @make -C ../../cpu/musashi\r
-\r
-Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h\r
-Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h\r
-\r
-# build helix libs\r
-../common/helix/$(CROSS)helix-mp3.a:\r
-       make -C ../common/helix clean all\r
 \r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ GP2X\r
 \r
-../../tools/textfilter: ../../tools/textfilter.c\r
-       make -C ../../tools/ textfilter\r
-\r
-\r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
 $(error TODO)\r

diff --git a/platform/pandora/emu.c b/platform/pandora/emu.c
index 0c6935b..1d0b33b 100644 (file)
--- a/platform/pandora/emu.c
+++ b/platform/pandora/emu.c
@@ -24,9 +24,9 @@
 #include "../common/common.h"\r
 #include "asm_utils.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/sound/mix.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/sound/mix.h>\r
 #include <zlib/zlib.h>\r
 \r
 //#define PFRAMES\r
@@ -294,8 +294,8 @@ static int EmuScanEnd16(unsigned int num)
                len = 256;\r
        }\r
 \r
-       if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
-               mask=0x3f; // accurate sprites, upper bits are priority stuff\r
+       if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
+               mask=0x3f; // messed sprites, upper bits are priority stuff\r
 \r
 #if 1\r
        clut_line(pd, ps, pal, (mask<<16) | len);\r
@@ -775,6 +775,11 @@ void emu_forcedFrame(int opts)
        currentConfig.EmuOpt = eo_old;\r
 }\r
 \r
+void emu_platformDebugCat(char *str)\r
+{\r
+       // nothing\r
+}\r
+\r
 static void simpleWait(int thissec, int lim_time)\r
 {\r
        struct timeval tval;\r

diff --git a/platform/psp/Makefile b/platform/psp/Makefile
index 21b2d6a..1d6b673 100644 (file)
--- a/platform/psp/Makefile
+++ b/platform/psp/Makefile
@@ -10,7 +10,7 @@ for_15fw = 1
 # :!touch platform/psp/psp.c\r
 \r
 \r
-CFLAGS += -I../.. -I. -DNO_SYNC\r
+CFLAGS += -I../.. -I. -DNO_SYNC -D_ASM_DRAW_C_AMIPS\r
 CFLAGS += -Wall -Winline -G0\r
 #CFLAGS += -DLPRINTF_STDIO\r
 #CFLAGS += -pg\r
@@ -32,28 +32,28 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += ../../picoAll.o\r
 else\r
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o Pico/VideoPort.o \\r
-               Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o \\r
-               Pico/Misc_amips.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o pico/videoport.o \\r
+               pico/draw2.o pico/draw.o pico/patch.o pico/draw_amips.o pico/memory_amips.o \\r
+               pico/misc_amips.o pico/debug.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/cue.o Pico/cd/gfx_cd.o \\r
-               Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\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/cue.o pico/cd/gfx_cd.o \\r
+               pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o\r
 # Pico - carthw\r
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
-               Pico/carthw/svp/ssp16.o\r
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
+               pico/carthw/svp/ssp16.o\r
 # Pico - Pico\r
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
 endif\r
 \r
 # Pico - sound\r
 ifneq "$(amalgamate)" "1"\r
-OBJS += Pico/sound/sound.o\r
+OBJS += pico/sound/sound.o\r
 endif\r
-OBJS += Pico/sound/mix.o\r
-OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
+OBJS += pico/sound/mix.o\r
+OBJS += pico/sound/sn76496.o pico/sound/ym2612.o\r
 # zlib (hacked)\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
@@ -81,7 +81,7 @@ OBJS += data/bg32.o data/bg40.o
 \r
 vpath %.c = ../..\r
 vpath %.s = ../..\r
-DIRS = platform platform/psp platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+DIRS = platform platform/psp platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
        zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80\r
 \r
 \r
@@ -125,23 +125,19 @@ cpu/fame/famec.o : ../../cpu/fame/famec.c
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -Wno-unused -c $< -o $@\r
 \r
-Pico/Memory.o : ../../Pico/Memory.c\r
+pico/misc.o : ../../pico/misc.c\r
        @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
-\r
-Pico/cd/Memory.o : ../../Pico/cd/Memory.c\r
-       @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -O2 -c $< -o $@\r
+       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
 \r
-Pico/Draw.o : ../../Pico/Draw.c\r
+pico/memory.o : ../../pico/memory.c\r
        @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_AMIPS\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
 \r
-Pico/Misc.o : ../../Pico/Misc.c\r
+pico/cd/memory.o : ../../pico/cd/memory.c\r
        @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@\r
 \r
-Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c\r
+pico/cd/gfx_cd.o : ../../pico/cd/gfx_cd.c\r
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -O2 -c $< -o $@\r
 \r

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 5c87355..91bd563 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -21,8 +21,8 @@
 #include "../common/emu.h"
 #include "../common/config.h"
 #include "../common/lprintf.h"
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/cd/cue.h"
+#include <pico/pico_int.h>
+#include <pico/cd/cue.h>
 
 #define OSD_FPS_X 432
 

diff --git a/platform/psp/menu.c b/platform/psp/menu.c
index 0e578b1..6fe06ae 100644 (file)
--- a/platform/psp/menu.c
+++ b/platform/psp/menu.c
@@ -27,8 +27,8 @@
 #include "../common/lprintf.h"
 #include "version.h"
 
-#include <Pico/PicoInt.h>
-#include <Pico/Patch.h>
+#include <pico/pico_int.h>
+#include <pico/patch.h>
 #include <zlib/zlib.h>
 
 

diff --git a/platform/psp/mp3.c b/platform/psp/mp3.c
index 19f6ec3..c1e6089 100644 (file)
--- a/platform/psp/mp3.c
+++ b/platform/psp/mp3.c
@@ -11,8 +11,8 @@
 #include <pspaudiocodec.h>
 #include <kubridge.h>
 
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/sound/mix.h"
+#include "../../pico/pico_int.h"
+#include "../../pico/sound/mix.h"
 #include "../common/lprintf.h"
 
 int mp3_last_error = 0;

diff --git a/platform/uiq3/Engine.cpp b/platform/uiq3/Engine.cpp
index ba93c81..a5205b8 100644 (file)
--- a/platform/uiq3/Engine.cpp
+++ b/platform/uiq3/Engine.cpp
@@ -23,7 +23,7 @@
 #include <string.h>\r
 \r
 #include "version.h"\r
-#include <Pico/PicoInt.h>\r
+#include <pico/pico_int.h>\r
 #include "../common/emu.h"\r
 #include "engine/debug.h"\r
 #include "App.h"\r

diff --git a/platform/uiq3/Makefile b/platform/uiq3/Makefile
index dcfff24..0f89a49 100644 (file)
--- a/platform/uiq3/Makefile
+++ b/platform/uiq3/Makefile
@@ -27,85 +27,58 @@ use_cyclone = 1
 # objects\r
 \r
 # launcher\r
-OBJ += App.o Engine.o Dialogs.o CSimpleTextParser.o emu.o\r
+OBJS += App.o Engine.o Dialogs.o CSimpleTextParser.o emu.o\r
 # engine\r
-OBJ += engine/main.o engine/vid.o engine/polledas.o engine/audio_mediaserver.o engine/debug.o\r
+OBJS += engine/main.o engine/vid.o engine/polledas.o engine/audio_mediaserver.o engine/debug.o\r
 ifeq "$(asm_blit)" "1"\r
-OBJ += engine/blit_asm.o\r
+OBJS += engine/blit_asm.o\r
 else\r
-OBJ += engine/blit.o\r
+OBJS += engine/blit.o\r
 endif\r
 # common\r
-OBJ += ../common/emu.o ../common/config.o ../common/menu.o ../common/mp3_helix.o\r
+OBJS += ../common/emu.o ../common/config.o ../common/menu.o ../common/mp3_helix.o\r
 # Pico\r
-OBJ += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
-               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \\r
+               pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o\r
 # Pico - CD\r
-OBJ += 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/cue.o Pico/cd/gfx_cd.o \\r
-               Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\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/cue.o pico/cd/gfx_cd.o \\r
+               pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o\r
 # Pico - Pico\r
-OBJ += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
 # Pico - carthw\r
-OBJ += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
-               Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o\r
-\r
-# asm stuff\r
-ifeq "$(asm_render)" "1"\r
-CFLAGS += -D_ASM_DRAW_C\r
-OBJ += Pico/draw_asm.o Pico/draw2_asm.o\r
-endif\r
-ifeq "$(asm_memory)" "1"\r
-CFLAGS += -D_ASM_MEMORY_C\r
-OBJ += Pico/memory_asm.o\r
-endif\r
-ifeq "$(asm_ym2612)" "1"\r
-CFLAGS += -D_ASM_YM2612_C\r
-OBJ += Pico/sound/ym2612_asm.o\r
-endif\r
-ifeq "$(asm_misc)" "1"\r
-CFLAGS += -D_ASM_MISC_C\r
-OBJ += Pico/misc_asm.o\r
-OBJ += Pico/cd/misc_asm.o\r
-endif\r
-ifeq "$(asm_cdpico)" "1"\r
-CFLAGS += -D_ASM_CD_PICO_C\r
-OBJ += Pico/cd/pico_asm.o\r
-endif\r
-ifeq "$(asm_cdmemory)" "1"\r
-CFLAGS += -D_ASM_CD_MEMORY_C\r
-OBJ += Pico/cd/memory_asm.o\r
-endif\r
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
+               pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
 \r
 # Pico - sound\r
-OBJ += Pico/sound/sound.o\r
-OBJ += Pico/sound/mix_asm.o\r
-OBJ += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
+OBJS += pico/sound/sound.o\r
+OBJS += pico/sound/mix_arm.o\r
+OBJS += pico/sound/sn76496.o pico/sound/ym2612.o\r
 # zlib\r
-OBJ += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\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
 # unzip\r
-OBJ += unzip/unzip.o unzip/unzip_stream.o\r
+OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
 CFLAGS += -DEMU_M68K\r
-OBJ += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
 endif\r
 ifeq "$(use_cyclone)" "1"\r
 CFLAGS += -DEMU_C68K\r
-OBJ += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
 endif\r
 # drz80\r
 CFLAGS += -D_USE_DRZ80\r
-OBJ += cpu/DrZ80/drz80.o\r
+OBJS += cpu/DrZ80/drz80.o\r
 # helix\r
-OBJ += ../common/helix/$(CROSS)helix-mp3.a\r
+OBJS += ../common/helix/$(CROSS)helix-mp3.a\r
 \r
 \r
 vpath %.c = ../..\r
 vpath %.s = ../..\r
 vpath %.S = ../..\r
-DIRS = platform platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+DIRS = platform platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
        zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
 \r
 ICONS := $(shell echo rsc/*.bmp)\r
@@ -125,8 +98,8 @@ EPOCRCFLAGS += -I./
 \r
 all: mkdirs sis\r
 \r
-include uiq3.mak\r
 include ../common/common_arm.mak\r
+include uiq3.mak\r
 \r
 \r
 $(NAME).mbg $(NAME).mbm : $(ICONS)\r

diff --git a/platform/uiq3/emu.c b/platform/uiq3/emu.c
index 7f42562..48fdc1d 100644 (file)
--- a/platform/uiq3/emu.c
+++ b/platform/uiq3/emu.c
@@ -4,7 +4,7 @@
 #include "../common/emu.h"
 #include "../common/config.h"
 #include "../common/menu.h"
-#include "Pico/PicoInt.h"
+#include "pico/pico_int.h"
 
 const char * const keyNames[] = {
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

diff --git a/platform/uiq3/engine/main.cpp b/platform/uiq3/engine/main.cpp
index 53454c9..de5ac27 100644 (file)
--- a/platform/uiq3/engine/main.cpp
+++ b/platform/uiq3/engine/main.cpp
@@ -17,7 +17,7 @@
 #include "debug.h"\r
 #include "../Engine.h"\r
 \r
-#include <Pico/PicoInt.h>\r
+#include <pico/pico_int.h>\r
 #include "../../common/emu.h"\r
 #include "../emu.h"\r
 #include "vid.h"\r

diff --git a/platform/uiq3/engine/vid.cpp b/platform/uiq3/engine/vid.cpp
index d21e854..b07e4a4 100644 (file)
--- a/platform/uiq3/engine/vid.cpp
+++ b/platform/uiq3/engine/vid.cpp
@@ -5,7 +5,7 @@
 \r
 #include "vid.h"\r
 #include "../Engine.h"\r
-#include <Pico/PicoInt.h>\r
+#include <pico/pico_int.h>\r
 #include "../../common/emu.h"\r
 #include "blit.h"\r
 #include "debug.h"\r

diff --git a/platform/uiq3/uiq3.mak b/platform/uiq3/uiq3.mak
index f5ad101..ddf2e84 100644 (file)
--- a/platform/uiq3/uiq3.mak
+++ b/platform/uiq3/uiq3.mak
@@ -77,7 +77,7 @@ REGDIR ?= ../reg
 SRCH += $(shell echo ../inc/*.h)
 SRC += $(shell echo ../src/*.cpp)
 SRCRES ?= $(shell echo $(RSCDIR)/*.rss $(RSCDIR)/*.rls $(REGDIR)/*.rss $(REGDIR)/*.rls)
-OBJ ?= $(SRC:.cpp=.o)
+OBJS ?= $(SRC:.cpp=.o)
 
 .PHONY : all mbm icon_mbm rsc reg loc bin sis run
 
@@ -126,9 +126,9 @@ bin : bin_elf
 
 bin_elf : $(NAME).elf.exe
 
-$(NAME).elf.exe : $(OBJ) $(EXTRALIB)
+$(NAME).elf.exe : $(OBJS) $(EXTRALIB)
        @echo "Linking..."
-       $(LD) $(LDFLAGS) $(OBJ) $(EXTRALIB) $(LDFLAGS2)
+       $(LD) $(LDFLAGS) $(OBJS) $(EXTRALIB) $(LDFLAGS2)
 
 .cpp.o :
        @echo "Compiling $< ..."
@@ -157,7 +157,7 @@ run : sis
        $(CXX) -M -DDEPS $(SRC) $(CXXFLAGS) >> $@
 
 clean :
-       rm -f $(NAME).exe $(NAME).elf.exe $(OBJ) tags .deps $(NAME).exe.map
+       rm -f $(NAME).exe $(NAME).elf.exe $(OBJS) tags .deps $(NAME).exe.map
        rm -f *.bkp ../src/*.bkp ../inc/*.bkp $(RSCDIR)/*.bkp $(REGDIR)/*.bkp
        rm -f $(RSCDIR)/*.rsc $(RSCDIR)/*.rsg
        rm -f $(REGDIR)/*.rsc $(REGDIR)/*.rsg

diff --git a/platform/win32/GenaDrive/Direct.cpp b/platform/win32/GenaDrive/Direct.cpp
index 3c8f376..da86b16 100644 (file)
--- a/platform/win32/GenaDrive/Direct.cpp
+++ b/platform/win32/GenaDrive/Direct.cpp
@@ -305,6 +305,8 @@ int DirectPresent()
 }\r
 \r
 #ifdef USE_D3D\r
+#define PI 3.14159265f\r
+\r
 static int MakeVertexList()\r
 {\r
   struct CustomVertex *vert=NULL,*pv=NULL;\r

diff --git a/platform/win32/GenaDrive/app.h b/platform/win32/GenaDrive/app.h
index 30d59cb..9bac46c 100644 (file)
--- a/platform/win32/GenaDrive/app.h
+++ b/platform/win32/GenaDrive/app.h
@@ -7,9 +7,7 @@
 \r
 #include <d3dx8.h>\r
 \r
-#include <Pico/Pico.h>\r
-\r
-#define PI 3.14159265f\r
+#include <pico/pico.h>\r
 \r
 #define RELEASE(x) if (x) x->Release();  x=NULL;\r
 \r