ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied patch 2118382 and did a few more compilation fixes 

for autotools scripts. Also remove INLINE declaration from
rtc.cpp. If you want them to be inline, move them in rtc.h
This commit is contained in:
yabause 2008-10-03 08:20:11 +00:00
parent e4679536c6
commit df9178d12b
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/INSTALL
View File

@ -2,7 +2,7 @@ Installation Instructions
************************* *************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006 Free Software Foundation, Inc. 2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it. unlimited permission to copy, distribute and modify it.
@ -67,6 +67,9 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came all sorts of other programs in order to regenerate files that came
with the distribution. with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options Compilers and Options
===================== =====================

3
desmume/src/Makefile.am
View File

@ -9,9 +9,11 @@ libdesmume_a_SOURCES = \
arm_instructions.cpp arm_instructions.h \ arm_instructions.cpp arm_instructions.h \
bios.cpp bios.h bits.h cp15.cpp cp15.h \ bios.cpp bios.h bits.h cp15.cpp cp15.h \
cflash.cpp cflash.h config.h fs.h \ cflash.cpp cflash.h config.h fs.h \
common.cpp common.h \
debug.cpp debug.h \ debug.cpp debug.h \
Disassembler.cpp Disassembler.h \ Disassembler.cpp Disassembler.h \
dscard.h fat.h FIFO.cpp FIFO.h \ dscard.h fat.h FIFO.cpp FIFO.h \
GPU_osd.cpp GPU_osd.h \
GPU.cpp GPU.h \ GPU.cpp GPU.h \
GPU_osd.cpp GPU_osd.h \ GPU_osd.cpp GPU_osd.h \
gl_vertex.cpp gl_vertex.h \ gl_vertex.cpp gl_vertex.h \
@ -23,6 +25,7 @@ libdesmume_a_SOURCES = \
OGLRender.cpp OGLRender.h \ OGLRender.cpp OGLRender.h \
ROMReader.cpp ROMReader.h \ ROMReader.cpp ROMReader.h \
render3D.cpp render3D.h \ render3D.cpp render3D.h \
rtc.cpp rtc.h \
saves.cpp saves.h \ saves.cpp saves.h \
SPU.cpp SPU.h \ SPU.cpp SPU.h \
gdbstub.h \ gdbstub.h \

19
desmume/src/gtk-glade/gdk_3Demu.cpp
View File

@ -29,7 +29,7 @@
#include "../types.h" #include "../types.h"
#include "../render3D.h" #include "../render3D.h"
#include "../opengl_collector_3Demu.h" #include "../OGLRender.h"
#include "gdk_3Demu.h" #include "gdk_3Demu.h"
/* /*
@ -126,14 +126,14 @@ examine_gl_config_attrib (GdkGLConfig *glconfig)
} }
static int static bool
begin_opengl_region_gdk_3d( void) { begin_opengl_region_gdk_3d( void) {
if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) { if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) {
return 0; return false;
} }
return 1; return true;
} }
static void static void
@ -141,10 +141,10 @@ end_opengl_region_gdk_3d( void) {
gdk_gl_drawable_gl_end (gldrawable); gdk_gl_drawable_gl_end (gldrawable);
} }
static int static bool
initialise_gdk_3d( void) { initialise_gdk_3d( void) {
/* this does nothing */ /* this does nothing */
return 1; return true;
} }
int int
@ -192,10 +192,9 @@ init_opengl_gdk_3Demu( void) {
return 0; return 0;
} }
begin_opengl_ogl_collector_platform = begin_opengl_region_gdk_3d; oglrender_init = initialise_gdk_3d;
end_opengl_ogl_collector_platform = end_opengl_region_gdk_3d; oglrender_beginOpenGL = begin_opengl_region_gdk_3d;
initialise_ogl_collector_platform = initialise_gdk_3d; oglrender_endOpenGL = end_opengl_region_gdk_3d;
return 1; return 1;
} }

4
desmume/src/gtk-glade/main.cpp
View File

@ -29,7 +29,7 @@
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE
#include <gtk/gtkgl.h> #include <gtk/gtkgl.h>
#include "../opengl_collector_3Demu.h" #include "../OGLRender.h"
#include "gdk_3Demu.h" #include "gdk_3Demu.h"
#endif #endif
@ -54,7 +54,7 @@ GPU3DInterface *core3DList[] = {
&gpu3DNull &gpu3DNull
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE
, ,
&gpu3D_opengl_collector &gpu3Dgl
#endif #endif
}; };

4
desmume/src/gtk/gdk_3Demu.cpp
View File

@ -188,8 +188,8 @@ init_opengl_gdk_3Demu( void) {
return 0; return 0;
} }
oglrender_init = _oglrender_init; oglrender_init = _oglrender_init;
oglrender_beginOpenGL = _oglrender_beginOpenGL; oglrender_beginOpenGL = _oglrender_beginOpenGL;
oglrender_endOpenGL = _oglrender_endOpenGL; oglrender_endOpenGL = _oglrender_endOpenGL;

7
desmume/src/rtc.cpp
View File

@ -26,6 +26,7 @@
#include "debug.h" #include "debug.h"
#include "armcpu.h" #include "armcpu.h"
#include <time.h> #include <time.h>
#include <string.h>
const u8 valRTC[100]= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, const u8 valRTC[100]= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
@ -223,7 +224,7 @@ INLINE void rtcPost(u8 data)
} }
} }
INLINE u8 rtcRead() u8 rtcRead()
{ {
u8 val; u8 val;
@ -239,7 +240,7 @@ INLINE u8 rtcRead()
return val; return val;
} }
INLINE void rtcWrite(u16 val) void rtcWrite(u16 val)
{ {
rtc.reg = val; rtc.reg = val;
@ -256,4 +257,4 @@ INLINE void rtcWrite(u16 val)
rtc.dataWrite = 0; rtc.dataWrite = 0;
} }
} }
} }