Cleanups

DrZ80_support.cpp

@@ -11,7 +11,7 @@
  * Support functions for interfacing with DrZ80
  */
 
-#include "StdAfx.h"
+#include "types.h"
 #include "main.h"
 #include "memory.h"
 

cz80.cpp

@@ -9,13 +9,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-/*#ifdef GP2X
-#include "gp2x/minimal.h"
-#else
-#include "sdl/minimal.h"
-#endif*/
 
-#include "StdAfx.h"
+#include "types.h"
 #include "main.h"
 #include "memory.h"
 

flash.cpp

@@ -13,15 +13,15 @@
  * for emulation of NGPC carts
  */
 
-#include "StdAfx.h"
-#include "race-memory.h"
-#include "flash.h"
 #include <string.h>
 #ifdef _WIN32
 #include <direct.h>
 #else
 #include <unistd.h>
 #endif
+#include "race-memory.h"
+#include "types.h"
+#include "flash.h"
 
 #if 0
 #define DEBUG_FLASH

graphics.cpp

@@ -9,7 +9,7 @@
 
 /* graphics.cpp: implementation of the graphics class. */
 
-#include "StdAfx.h"
+#include "types.h"
 #include "graphics.h"
 #include "race-memory.h"
 

libretro/libretro.cpp

@@ -3,7 +3,7 @@
 #include "log.h"
 #include <string.h>
 
-#include "../StdAfx.h"
+#include "../types.h"
 #include "../state.h"
 #include "../neopopsound.h"
 #include "../sound.h"

main.cpp

@@ -12,7 +12,7 @@
 
 #include "unzip.h"
 
-#include "StdAfx.h"
+#include "types.h"
 #include "main.h"
 
 
@@ -39,11 +39,11 @@ extern int finscan;
 extern int language;
 extern int tipo_consola;
 
-BOOL		m_bIsActive;
+int		m_bIsActive;
 EMUINFO		m_emuInfo;
 SYSTEMINFO	m_sysInfo[NR_OF_SYSTEMS];
 
-#define numberof(a)		(sizeof(a)/sizeof(*(a)))
+#define ARRAY_SIZE(a)		(sizeof(a)/sizeof(*(a)))
 
 void mainemuinit(void)
 {
@@ -245,11 +245,12 @@ int loadFromZipByName(unsigned char *buffer, char *archive,
       //Vérifions que c'est la bonne extension
       char *extension = getFileNameExtension(name);
 
-      for (i=0;i<numberof(recognizedExtensions);i++)		{
+      for (i=0;i < ARRAY_SIZE(recognizedExtensions);i++)
+      {
          if (!strcmp(extension, recognizedExtensions[i]))
             break;
       }
-      if (i < numberof(recognizedExtensions))
+      if (i < ARRAY_SIZE(recognizedExtensions))
          break;
 
       zerror = unzGoToNextFile(zhandle);

main.h

@@ -14,10 +14,6 @@ struct SYSTEMINFO {
 	int		vSize;
 	int		Ticks;
 	int		InputKeys[12];
-	/* Dynamic System Info */
-	BOOL	Back0;
-	BOOL	Back1;
-	BOOL	Sprites;
 };
 
 struct EMUINFO
@@ -50,7 +46,7 @@ struct EMUINFO
 #define NR_OF_SYSTEMS	2
 
 
-extern BOOL		m_bIsActive;
+extern int		m_bIsActive;
 extern EMUINFO		m_emuInfo;
 extern SYSTEMINFO	m_sysInfo[NR_OF_SYSTEMS];
 extern int romSize;

neopopsound.c

@@ -27,7 +27,7 @@
  *                                                                      *
  ************************************************************************/
 
-#include "StdAfx.h"
+#include "types.h"
 
 #include <string.h>
 

neopopsound.h

@@ -23,7 +23,7 @@
 #ifndef __NEOPOPSOUND__
 #define __NEOPOPSOUND__
 
-#include "StdAfx.h"
+#include "types.h"
 
 typedef struct
 {

ngpBios.c

@@ -9,7 +9,7 @@
 
 /* ngpBios.cpp: implementation of the ngpBios class. */
 
-#include "StdAfx.h"
+#include "types.h"
 #include "ngpBios.h"
 
 unsigned char sysfont[8*256] =

race-memory.cpp

@@ -14,8 +14,8 @@
  * TODO:
  */
 
-#include "StdAfx.h"
 #include "race-memory.h"
+#include "types.h"
 #include "input.h"		/* for Gameboy Input */
 #include "graphics.h"	/* for i/o ports of the game gear */
 #include "tlcs900h.h"

race-memory.h

@@ -11,7 +11,7 @@
 #ifndef _MEMORYH_
 #define _MEMORYH_
 
-#include "StdAfx.h"
+#include "types.h"
 #include "neopopsound.h"
 #include "sound.h"
 #include "input.h"

sound.cpp

@@ -9,8 +9,8 @@
 
 /* sound.cpp: implementation of the sound class. */
 
-#include "StdAfx.h"
 #include "main.h"
+#include "types.h"
 #include "sound.h"
 #include "memory.h"
 

sound.h

@@ -9,14 +9,14 @@
 
 /* sound.h: interface for the sound class. */
 
-#if !defined(AFX_SOUND_H__15E0A182_A0FD_11D4_8645_0050DA4EEEA0__INCLUDED_)
-#define AFX_SOUND_H__15E0A182_A0FD_11D4_8645_0050DA4EEEA0__INCLUDED_
+#ifndef AFX_SOUND_H
+#define AFX_SOUND_H
 
 #if _MSC_VER > 1000
 #pragma once
 #endif /* _MSC_VER > 1000 */
 
-#include "StdAfx.h"
+#include "types.h"
 #include "main.h"
 
 int initSound(void);
@@ -49,4 +49,4 @@ void ngpSoundExecute(void);
 void ngpSoundOff(void);
 void ngpSoundInterrupt(void);
 
-#endif /* !defined(AFX_SOUND_H__15E0A182_A0FD_11D4_8645_0050DA4EEEA0__INCLUDED_) */
+#endif /* !defined(AFX_SOUND_H) */

tlcs900h.cpp

@@ -29,13 +29,12 @@
 //////////////////////////////////////////////////////////////////////
 
 
-#include "StdAfx.h"
-
 #include <stdlib.h>
 #include <time.h>
 #include "tlcs900h.h"
 #include "race-memory.h"
 #include "ngpBios.h"
+#include "types.h"
 
 #ifdef _DEBUG
 #undef THIS_FILE
@@ -117,7 +116,7 @@ gen_regsXHL3, gen_regsXIX, gen_regsXIY, gen_regsXIZ, gen_regsXSP,
 gen_regsSP, gen_regsXSSP, gen_regsXNSP;
 
 #ifdef TARGET_GP2X
-//it's defined in StdAfx.h
+//it's defined in types.h
 #ifndef GENREGSPC_AS_REG
 unsigned int gen_regsPC;
 #endif
@@ -168,7 +167,7 @@ unsigned int gen_regsPC, gen_regsSR;
 unsigned char F2;
 
 #ifdef TARGET_GP2X
-//it's defined in StdAfx.h
+//it's defined in types.h
 #else
 unsigned char *my_pc = NULL;
 #endif