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

fixed compilation on osx

This commit is contained in:
gecko_reverse 2008-12-28 20:12:44 +00:00
parent 84e6371f2d
commit 008523a5ff
9 changed files with 101 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desmume/src/cocoa/DeSmuME.cbp
View File

@ -104,6 +104,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA]]>
<Unit filename="../NDSSystem.h" />
<Unit filename="../OGLRender.cpp" />
<Unit filename="../OGLRender.h" />
<Unit filename="../PACKED.h" />
<Unit filename="../PACKED_END.h" />
<Unit filename="../ROMReader.cpp" />
<Unit filename="../ROMReader.h" />
<Unit filename="../SPU.cpp" />
@ -202,6 +204,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA]]>
<Unit filename="../mc.h" />
<Unit filename="../mem.h" />
<Unit filename="../memorystream.h" />
<Unit filename="../movie.cpp" />
<Unit filename="../movie.h" />
<Unit filename="../readwrite.cpp" />
<Unit filename="../readwrite.h" />
<Unit filename="../registers.h" />
@ -211,6 +215,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA]]>
<Unit filename="../rtc.h" />
<Unit filename="../saves.cpp" />
<Unit filename="../saves.h" />
<Unit filename="../shaders.h" />
<Unit filename="../softrender.cpp" />
<Unit filename="../softrender.h" />
<Unit filename="../softrender_config.h" />
@ -219,6 +224,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA]]>
<Unit filename="../thumb_instructions.cpp" />
<Unit filename="../thumb_instructions.h" />
<Unit filename="../types.h" />
<Unit filename="../utils/ConvertUTF.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../utils/ConvertUTF.h" />
<Unit filename="../utils/decrypt/crc.cpp" />
<Unit filename="../utils/decrypt/crc.h" />
<Unit filename="../utils/decrypt/decrypt.cpp" />
<Unit filename="../utils/decrypt/decrypt.h" />
<Unit filename="../utils/decrypt/header.cpp" />
<Unit filename="../utils/decrypt/header.h" />
<Unit filename="../utils/guid.cpp" />
<Unit filename="../utils/guid.h" />
<Unit filename="../utils/md5.cpp" />
<Unit filename="../utils/md5.h" />
<Unit filename="../utils/valuearray.h" />
<Unit filename="../utils/xstring.cpp" />
<Unit filename="../utils/xstring.h" />
<Unit filename="../wifi.cpp" />
<Unit filename="../wifi.h" />
<Unit filename="../zero_private.h" />

65
desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj
View File

@ -7,6 +7,14 @@
objects = {
/* Begin PBXBuildFile section */
1FDD29340F080D68004021C9 /* movie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD292F0F080D68004021C9 /* movie.cpp */; };
1FDD294E0F080DBD004021C9 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD293E0F080DBD004021C9 /* ConvertUTF.c */; };
1FDD294F0F080DBD004021C9 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD29410F080DBD004021C9 /* crc.cpp */; };
1FDD29500F080DBD004021C9 /* decrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD29430F080DBD004021C9 /* decrypt.cpp */; };
1FDD29510F080DBD004021C9 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD29450F080DBD004021C9 /* header.cpp */; };
1FDD29520F080DBD004021C9 /* guid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD29470F080DBD004021C9 /* guid.cpp */; };
1FDD29530F080DBD004021C9 /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD29490F080DBD004021C9 /* md5.cpp */; };
1FDD29540F080DBD004021C9 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD294C0F080DBD004021C9 /* xstring.cpp */; };
721F43D10EA2A18F0037FB33 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 721F43C50EA2A18F0037FB33 /* common.cpp */; };
721F43D20EA2A18F0037FB33 /* rtc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 721F43C90EA2A18F0037FB33 /* rtc.cpp */; };
721F43D30EA2A18F0037FB33 /* softrender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 721F43CB0EA2A18F0037FB33 /* softrender.cpp */; };
@ -61,6 +69,26 @@
/* Begin PBXFileReference section */
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
1FDD292F0F080D68004021C9 /* movie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = movie.cpp; path = ../movie.cpp; sourceTree = SOURCE_ROOT; };
1FDD29300F080D68004021C9 /* movie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = movie.h; path = ../movie.h; sourceTree = SOURCE_ROOT; };
1FDD29310F080D68004021C9 /* PACKED.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PACKED.h; path = ../PACKED.h; sourceTree = SOURCE_ROOT; };
1FDD29320F080D68004021C9 /* PACKED_END.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PACKED_END.h; path = ../PACKED_END.h; sourceTree = SOURCE_ROOT; };
1FDD29330F080D68004021C9 /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shaders.h; path = ../shaders.h; sourceTree = SOURCE_ROOT; };
1FDD293E0F080DBD004021C9 /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ConvertUTF.c; path = ../utils/ConvertUTF.c; sourceTree = SOURCE_ROOT; };
1FDD293F0F080DBD004021C9 /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvertUTF.h; path = ../utils/ConvertUTF.h; sourceTree = SOURCE_ROOT; };
1FDD29410F080DBD004021C9 /* crc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = crc.cpp; sourceTree = "<group>"; };
1FDD29420F080DBD004021C9 /* crc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crc.h; sourceTree = "<group>"; };
1FDD29430F080DBD004021C9 /* decrypt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decrypt.cpp; sourceTree = "<group>"; };
1FDD29440F080DBD004021C9 /* decrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decrypt.h; sourceTree = "<group>"; };
1FDD29450F080DBD004021C9 /* header.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = header.cpp; sourceTree = "<group>"; };
1FDD29460F080DBD004021C9 /* header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = header.h; sourceTree = "<group>"; };
1FDD29470F080DBD004021C9 /* guid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guid.cpp; path = ../utils/guid.cpp; sourceTree = SOURCE_ROOT; };
1FDD29480F080DBD004021C9 /* guid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guid.h; path = ../utils/guid.h; sourceTree = SOURCE_ROOT; };
1FDD29490F080DBD004021C9 /* md5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = md5.cpp; path = ../utils/md5.cpp; sourceTree = SOURCE_ROOT; };
1FDD294A0F080DBD004021C9 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = md5.h; path = ../utils/md5.h; sourceTree = SOURCE_ROOT; };
1FDD294B0F080DBD004021C9 /* valuearray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = valuearray.h; path = ../utils/valuearray.h; sourceTree = SOURCE_ROOT; };
1FDD294C0F080DBD004021C9 /* xstring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xstring.cpp; path = ../utils/xstring.cpp; sourceTree = SOURCE_ROOT; };
1FDD294D0F080DBD004021C9 /* xstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xstring.h; path = ../utils/xstring.h; sourceTree = SOURCE_ROOT; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
721F43C50EA2A18F0037FB33 /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = common.cpp; path = ../common.cpp; sourceTree = SOURCE_ROOT; };
@ -235,6 +263,20 @@
name = Products;
sourceTree = "<group>";
};
1FDD29400F080DBD004021C9 /* decrypt */ = {
isa = PBXGroup;
children = (
1FDD29410F080DBD004021C9 /* crc.cpp */,
1FDD29420F080DBD004021C9 /* crc.h */,
1FDD29430F080DBD004021C9 /* decrypt.cpp */,
1FDD29440F080DBD004021C9 /* decrypt.h */,
1FDD29450F080DBD004021C9 /* header.cpp */,
1FDD29460F080DBD004021C9 /* header.h */,
);
name = decrypt;
path = ../utils/decrypt;
sourceTree = SOURCE_ROOT;
};
29B97314FDCFA39411CA2CEA /* DeSmuME */ = {
isa = PBXGroup;
children = (
@ -252,6 +294,21 @@
29B97315FDCFA39411CA2CEA /* Core */ = {
isa = PBXGroup;
children = (
1FDD293E0F080DBD004021C9 /* ConvertUTF.c */,
1FDD293F0F080DBD004021C9 /* ConvertUTF.h */,
1FDD29400F080DBD004021C9 /* decrypt */,
1FDD29470F080DBD004021C9 /* guid.cpp */,
1FDD29480F080DBD004021C9 /* guid.h */,
1FDD29490F080DBD004021C9 /* md5.cpp */,
1FDD294A0F080DBD004021C9 /* md5.h */,
1FDD294B0F080DBD004021C9 /* valuearray.h */,
1FDD294C0F080DBD004021C9 /* xstring.cpp */,
1FDD294D0F080DBD004021C9 /* xstring.h */,
1FDD292F0F080D68004021C9 /* movie.cpp */,
1FDD29300F080D68004021C9 /* movie.h */,
1FDD29310F080D68004021C9 /* PACKED.h */,
1FDD29320F080D68004021C9 /* PACKED_END.h */,
1FDD29330F080D68004021C9 /* shaders.h */,
721F43C50EA2A18F0037FB33 /* common.cpp */,
721F43C60EA2A18F0037FB33 /* common.h */,
721F43C70EA2A18F0037FB33 /* memorystream.h */,
@ -483,6 +540,14 @@
721F43D30EA2A18F0037FB33 /* softrender.cpp in Sources */,
721F43E50EA2A23F0037FB33 /* sndOSX.mm in Sources */,
721F44230EA2BB6E0037FB33 /* rom_info.m in Sources */,
1FDD29340F080D68004021C9 /* movie.cpp in Sources */,
1FDD294E0F080DBD004021C9 /* ConvertUTF.c in Sources */,
1FDD294F0F080DBD004021C9 /* crc.cpp in Sources */,
1FDD29500F080DBD004021C9 /* decrypt.cpp in Sources */,
1FDD29510F080DBD004021C9 /* header.cpp in Sources */,
1FDD29520F080DBD004021C9 /* guid.cpp in Sources */,
1FDD29530F080DBD004021C9 /* md5.cpp in Sources */,
1FDD29540F080DBD004021C9 /* xstring.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

3
desmume/src/cocoa/Rakefile
View File

@ -12,7 +12,8 @@ compile = {
:files => Dir['*.m'] + Dir['*.mm'] + Dir['dialogs/*.m'] + Dir['dialogs/*.mm'] + ([
'MMU', 'SPU', 'cflash', 'fs-linux', 'matrix', 'FIFO', 'NDSSystem', 'arm_instructions', 'cp15', 'mc',
'thumb_instructions', 'GPU', 'OGLRender', 'armcpu', 'gfx3d', 'render3D', 'wifi', 'GPU_osd', 'ROMReader',
'bios', 'debug', 'saves', 'readwrite', 'rtc', 'softrender', 'common'].map { |core_file| '../' + core_file + '.cpp' } ),
'bios', 'debug', 'saves', 'readwrite', 'rtc', 'softrender', 'common'].map { |core_file| '../' + core_file + '.cpp' } ) +
Dir['../utils/*.c'] + Dir['../utils/*.cpp'] + Dir['../utils/decrypt/*.cpp'],
:defines => {
:global => ['DESMUME_OBJ_C'],
:cocoa => ['DESMUME_COCOA', 'HAVE_LIBZ', 'HAVE_OPENGL']},

2
desmume/src/utils/decrypt/decrypt.cpp
View File

@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
#include "types.h"
#include "../../types.h"
#include "crc.h"
#include "header.h"

6
desmume/src/utils/decrypt/header.h
View File

@ -5,9 +5,9 @@
#define _HEADER_H_
#include "types.h"
#include "../../types.h"
#include "PACKED.h"
#include "../../PACKED.h"
struct __PACKED Header
{
char title[0xC];
@ -74,7 +74,7 @@ struct __PACKED Header
u32 offset_0x16C;
unsigned char zero[0x90];
};
#include "PACKED_END.h"
#include "../../PACKED_END.h"

2
desmume/src/utils/guid.cpp
View File

@ -1,6 +1,6 @@
#include <stdlib.h>
#include "guid.h"
#include "types.h"
#include "../types.h"
void Desmume_Guid::newGuid()
{

2
desmume/src/utils/guid.h
View File

@ -2,7 +2,7 @@
#define _guid_h_
#include <string>
#include "types.h"
#include "../types.h"
#include "valuearray.h"
struct Desmume_Guid : public ValueArray<u8,16>

2
desmume/src/utils/md5.h
View File

@ -1,7 +1,7 @@
#ifndef _MD5_H
#define _MD5_H
#include "types.h"
#include "../types.h"
#include "valuearray.h"
struct md5_context

2
desmume/src/utils/xstring.h
View File

@ -9,7 +9,7 @@
#include <vector>
#include <iostream>
#include "types.h"
#include "../types.h"
//definitions for str_strip() flags