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

Get rid of emufile_types.h

This commit is contained in:
twinaphex 2016-08-16 08:49:32 +02:00 committed by zeromus
parent cf185123eb
commit be01a89164
5 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/Makefile.am
View File

@ -19,7 +19,7 @@ libdesmume_a_SOURCES = \
common.cpp common.h \
debug.cpp debug.h \
Disassembler.cpp Disassembler.h \
emufile.h emufile.cpp emufile_types.h encrypt.h encrypt.cpp FIFO.cpp FIFO.h \
emufile.h emufile.cpp encrypt.h encrypt.cpp FIFO.cpp FIFO.h \
firmware.cpp firmware.h GPU.cpp GPU.h \
GPU_osd.h \
instructions.h \

2
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj
View File

@ -1572,7 +1572,6 @@
ABD1FE781345AC8400AF11D1 /* desmume_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = desmume_config.h; path = ../desmume_config.h; sourceTree = SOURCE_ROOT; };
ABD1FE791345AC8400AF11D1 /* Disassembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Disassembler.h; path = ../Disassembler.h; sourceTree = SOURCE_ROOT; };
ABD1FE7A1345AC8400AF11D1 /* driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = driver.h; path = ../driver.h; sourceTree = SOURCE_ROOT; };
ABD1FE7B1345AC8400AF11D1 /* emufile_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emufile_types.h; path = ../emufile_types.h; sourceTree = SOURCE_ROOT; };
ABD1FE7C1345AC8400AF11D1 /* emufile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emufile.h; path = ../emufile.h; sourceTree = SOURCE_ROOT; };
ABD1FE7D1345AC8400AF11D1 /* FIFO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIFO.h; path = ../FIFO.h; sourceTree = SOURCE_ROOT; };
ABD1FE7E1345AC8400AF11D1 /* firmware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = firmware.h; path = ../firmware.h; sourceTree = SOURCE_ROOT; };
@ -2669,7 +2668,6 @@
ABD1FE791345AC8400AF11D1 /* Disassembler.h */,
ABD1FE7A1345AC8400AF11D1 /* driver.h */,
ABD1FE7C1345AC8400AF11D1 /* emufile.h */,
ABD1FE7B1345AC8400AF11D1 /* emufile_types.h */,
ABCFA9F2178BDE920030C8BA /* encrypt.h */,
ABD1FE7D1345AC8400AF11D1 /* FIFO.h */,
ABD1FE7E1345AC8400AF11D1 /* firmware.h */,

2
desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
View File

@ -1983,7 +1983,6 @@
ABD1FE781345AC8400AF11D1 /* desmume_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = desmume_config.h; path = ../desmume_config.h; sourceTree = SOURCE_ROOT; };
ABD1FE791345AC8400AF11D1 /* Disassembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Disassembler.h; path = ../Disassembler.h; sourceTree = SOURCE_ROOT; };
ABD1FE7A1345AC8400AF11D1 /* driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = driver.h; path = ../driver.h; sourceTree = SOURCE_ROOT; };
ABD1FE7B1345AC8400AF11D1 /* emufile_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emufile_types.h; path = ../emufile_types.h; sourceTree = SOURCE_ROOT; };
ABD1FE7C1345AC8400AF11D1 /* emufile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emufile.h; path = ../emufile.h; sourceTree = SOURCE_ROOT; };
ABD1FE7D1345AC8400AF11D1 /* FIFO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIFO.h; path = ../FIFO.h; sourceTree = SOURCE_ROOT; };
ABD1FE7E1345AC8400AF11D1 /* firmware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = firmware.h; path = ../firmware.h; sourceTree = SOURCE_ROOT; };
@ -3121,7 +3120,6 @@
ABD1FE791345AC8400AF11D1 /* Disassembler.h */,
ABD1FE7A1345AC8400AF11D1 /* driver.h */,
ABD1FE7C1345AC8400AF11D1 /* emufile.h */,
ABD1FE7B1345AC8400AF11D1 /* emufile_types.h */,
ABA93EAE178C7D4200CBF50B /* encrypt.h */,
ABD1FE7D1345AC8400AF11D1 /* FIFO.h */,
ABD1FE7E1345AC8400AF11D1 /* firmware.h */,

2
desmume/src/emufile.h
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#include <string>
#include <stdarg.h>
#include "emufile_types.h"
#include "types.h"
#ifdef HOST_WINDOWS
#include <io.h>

6
desmume/src/emufile_types.h
View File

@ -1,6 +0,0 @@
#ifndef EMUFILE_TYPES_H
#define EMUFILE_TYPES_H
#include "types.h"
#endif //EMUFILE_TYPES_H