From 00e77306e015e84b85391dfad43990a0379e9ddc Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 8 Sep 2008 07:38:17 +0000 Subject: [PATCH] more cpp work --- desmume/src/Makefile.am | 40 +++++++++---------- ...tor_3Demu.c => opengl_collector_3Demu.cpp} | 0 2 files changed, 20 insertions(+), 20 deletions(-) rename desmume/src/{opengl_collector_3Demu.c => opengl_collector_3Demu.cpp} (100%) diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am index f17398d6b..9bd73c56d 100644 --- a/desmume/src/Makefile.am +++ b/desmume/src/Makefile.am @@ -1,28 +1,28 @@ include $(top_srcdir)/src/desmume.mk -EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.c fs-windows.c +EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade windows SUBDIRS = . gdbstub $(UI_DIR) noinst_LIBRARIES = libdesmume.a libdesmume_a_SOURCES = \ - armcpu.c armcpu.h ARM9.h \ - arm_instructions.c arm_instructions.h \ - bios.c bios.h bits.h cp15.c cp15.h \ - cflash.c cflash.h config.h fs.h \ - debug.c debug.h \ - Disassembler.c Disassembler.h \ - dscard.h fat.h FIFO.c FIFO.h \ - GPU.c GPU.h \ - gl_vertex.c gl_vertex.h \ - mem.h mc.c mc.h \ - wifi.c wifi.h \ - MMU.c MMU.h NDSSystem.c NDSSystem.h registers.h \ - ROMReader.c ROMReader.h \ - render3D.c render3D.h \ - saves.c saves.h \ - SPU.c SPU.h \ + armcpu.cpp armcpu.h ARM9.h \ + arm_instructions.cpp arm_instructions.h \ + bios.cpp bios.h bits.h cp15.cpp cp15.h \ + cflash.cpp cflash.h config.h fs.h \ + debug.cpp debug.h \ + Disassembler.cpp Disassembler.h \ + dscard.h fat.h FIFO.cpp FIFO.h \ + GPU.cpp GPU.h \ + gl_vertex.cpp gl_vertex.h \ + mem.h mc.cpp mc.h \ + wifi.cpp wifi.h \ + MMU.cpp MMU.h NDSSystem.cpp NDSSystem.h registers.h \ + ROMReader.cpp ROMReader.h \ + render3D.cpp render3D.h \ + saves.cpp saves.h \ + SPU.cpp SPU.h \ gdbstub.h \ - matrix.c matrix.h \ - opengl_collector_3Demu.c opengl_collector_3Demu.h \ - thumb_instructions.c thumb_instructions.h types.h + matrix.cpp matrix.h \ + opengl_collector_3Demu.cpp opengl_collector_3Demu.h \ + thumb_instructions.cpp thumb_instructions.h types.h libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) diff --git a/desmume/src/opengl_collector_3Demu.c b/desmume/src/opengl_collector_3Demu.cpp similarity index 100% rename from desmume/src/opengl_collector_3Demu.c rename to desmume/src/opengl_collector_3Demu.cpp