more cleanups

diff --git a/3d.h b/3d.h
deleted file mode 100644 (file)
index 6585fa7..0000000
--- a/3d.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- *
- * (c) Copyright 1996 - 2001 Gary Henderson (gary.henderson@ntlworld.com) and
- *                           Jerremy Koot (jkoot@snes9x.com)
- *
- * Super FX C emulator code 
- * (c) Copyright 1997 - 1999 Ivar (ivar@snes9x.com) and
- *                           Gary Henderson.
- * Super FX assembler emulator code (c) Copyright 1998 zsKnight and _Demo_.
- *
- * DSP1 emulator code (c) Copyright 1998 Ivar, _Demo_ and Gary Henderson.
- * C4 asm and some C emulation code (c) Copyright 2000 zsKnight and _Demo_.
- * C4 C code (c) Copyright 2001 Gary Henderson (gary.henderson@ntlworld.com).
- *
- * DOS port code contains the works of other authors. See headers in
- * individual files.
- *
- * Snes9x homepage: http://www.snes9x.com
- *
- * Permission to use, copy, modify and distribute Snes9x in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Snes9x is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Snes9x or software derived from Snes9x.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so everyone can benefit from the modifications
- * in future versions.
- *
- * Super NES and Super Nintendo Entertainment System are trademarks of
- * Nintendo Co., Limited and its subsidiary companies.
- */
-#ifndef _3D_H_
-#define _3D_H_
-
-#if defined(USE_OPENGL)
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-#ifdef __linux__
-//#include <GL/glx.h>
-#endif
-
-typedef struct
-{
-    bool8       packed_pixels_extension_present;
-    bool8       draw_cube;
-    uint32      version;
-    // Texture format
-    GLint       internal_format;
-    GLint       format;
-    GLint       type;
-
-    GLint       max_texture_size;// 256 or 512
-    GLint       texture_size;
-    uint32      num_textures;    // 1 if max_texture_size == 256, 2 otherwise
-    GLuint      textures [2];
-} OpenGLData;
-
-extern OpenGLData OpenGL;
-
-bool8 S9xOpenGLInit ();
-bool8 S9xOpenGLInit2 ();
-void S9xOpenGLPutImage (int width, int height);
-void S9xOpenGLDeinit ();
-
-#endif
-
-#ifdef USE_GLIDE
-//#include <glide.h>
-
-typedef struct
-{
-    bool8      voodoo_present;
-    GrVertex   sq[4];
-    GrTexInfo  texture;
-    int32      texture_mem_size;
-    int32      texture_mem_start;
-    float      x_offset, y_offset;
-    float      x_scale, y_scale;
-    float      voodoo_width;
-    float      voodoo_height;
-} GlideData;
-
-extern GlideData Glide;
-bool8 S9xGlideEnable (bool8 enable);
-void S9xGlideDeinit ();
-bool8 S9xGlideInit ();
-bool8 S9xVoodooInitialise ();
-#endif
-
-#endif

diff --git a/gfx.cpp b/gfx.cpp
index a357d09..ce2421b 100644 (file)
--- a/gfx.cpp
+++ b/gfx.cpp
@@ -4003,4 +4003,6 @@ bool8_32 S9xSetRenderPixelFormat (int format)
     }
     return (FALSE);
 }
+
 #endif
+

diff --git a/memset.s b/memset.s
deleted file mode 100644 (file)
index 5e0f168..0000000
--- a/memset.s
+++ /dev/null
@@ -1,51 +0,0 @@
-               .text
-               .global gp2x_memset;
-               ;@.type gp2x_memset,%function
-               .align 4;
-
-gp2x_memset:
-       mov     a4, a1
-       cmp     a3, $8          @ at least 8 bytes to do?
-       blt     2f
-       orr     a2, a2, a2, lsl $8
-       orr     a2, a2, a2, lsl $16
-1:
-       tst     a4, $3          @ aligned yet?
-       strneb  a2, [a4], $1
-       subne   a3, a3, $1
-       bne     1b
-       mov     ip, a2
-1:
-       cmp     a3, $8          @ 8 bytes still to do?
-       blt     2f
-       stmia   a4!, {a2, ip}
-       sub     a3, a3, $8
-       cmp     a3, $8          @ 8 bytes still to do?
-       blt     2f
-       stmia   a4!, {a2, ip}
-       sub     a3, a3, $8
-       cmp     a3, $8          @ 8 bytes still to do?
-       blt     2f
-       stmia   a4!, {a2, ip}
-       sub     a3, a3, $8
-       cmp     a3, $8          @ 8 bytes still to do?
-       stmgeia a4!, {a2, ip}
-       subge   a3, a3, $8
-       bge     1b
-2:
-       movs    a3, a3          @ anything left?
-       moveq   pc, lr          @ nope
-       rsb     a3, a3, $7
-       add     pc, pc, a3, lsl $2
-       mov     r0, r0
-       strb    a2, [a4], $1
-       strb    a2, [a4], $1
-       strb    a2, [a4], $1
-       strb    a2, [a4], $1
-       strb    a2, [a4], $1
-       strb    a2, [a4], $1
-       strb    a2, [a4], $1
-       mov     pc, lr
-
-
-

diff --git a/newres.h b/newres.h
deleted file mode 100644 (file)
index 2b6331f..0000000
--- a/newres.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __NEWRES_H__
-#define __NEWRES_H__
-
-#if !defined(UNDER_CE)
-#define UNDER_CE _WIN32_WCE
-#endif
-
-#if defined(_WIN32_WCE)
-       #if !defined(WCEOLE_ENABLE_DIALOGEX)
-               #define DIALOGEX DIALOG DISCARDABLE
-       #endif
-       #include <commctrl.h>
-       #define  SHMENUBAR RCDATA
-       #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
-               #include <aygshell.h>
-               #define AFXCE_IDR_SCRATCH_SHMENU  28700
-       #else
-               #define I_IMAGENONE             (-2)
-               #define NOMENU                  0xFFFF
-               #define IDS_SHNEW               1
-
-               #define IDM_SHAREDNEW        10
-               #define IDM_SHAREDNEWDEFAULT 11
-       #endif // _WIN32_WCE_PSPC
-       #define AFXCE_IDD_SAVEMODIFIEDDLG 28701
-#endif // _WIN32_WCE
-
-#ifdef RC_INVOKED
-#ifndef _INC_WINDOWS
-#define _INC_WINDOWS
-       #include "winuser.h"           // extract from windows header
-       //#include "winver.h"   
-#endif
-#endif
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC      (-1)
-
-#endif //__NEWRES_H__

diff --git a/tile.cpp b/tile.cpp
index f516d44..e537a4c 100644 (file)
--- a/tile.cpp
+++ b/tile.cpp
@@ -46,10 +46,6 @@
 #include "gfx.h"
 #include "tile.h"
 
-#ifdef USE_GLIDE
-#include "3d.h"
-#endif
-
 #define TILE_PREAMBLE \
     uint8 *pCache; \
 \
@@ -1494,3 +1490,4 @@ void DrawHiResClippedTile16 (uint32 Tile, uint32 Offset,
     TILE_CLIP_PREAMBLE
     RENDER_CLIPPED_TILEHI(WRITE_4PIXELSHI16, WRITE_4PIXELSHI16_FLIPPED, 4)
 }
+