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

Cocoa Port: Update include paths due to commit #ed40663.

This commit is contained in:
rogerman 2016-11-26 17:21:13 -08:00
parent 2612484c54
commit 7f77037c75
15 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desmume/src/frontend/cocoa/OGLDisplayOutput.cpp
View File

@ -18,7 +18,7 @@
#include "OGLDisplayOutput.h"
#include "cocoa_globals.h"
#include "utilities.h"
#include "../filter/videofilter.h"
#include "../../filter/videofilter.h"
#include <sstream>
@ -4363,7 +4363,7 @@ static void InitHQnxLUTs()
{
switch (pattern)
{
#include "../filter/lq2x.h"
#include "../../filter/lq2x.h"
}
}
}
@ -4382,7 +4382,7 @@ static void InitHQnxLUTs()
{
switch (pattern)
{
#include "../filter/hq2x.h"
#include "../../filter/hq2x.h"
}
}
}
@ -4401,7 +4401,7 @@ static void InitHQnxLUTs()
{
switch (pattern)
{
#include "../filter/hq3x.dat"
#include "../../filter/hq3x.dat"
}
}
}
@ -4420,7 +4420,7 @@ static void InitHQnxLUTs()
{
switch (pattern)
{
#include "../filter/hq4x.dat"
#include "../../filter/hq4x.dat"
}
}
}

2
desmume/src/frontend/cocoa/OGLDisplayOutput.h
View File

@ -29,7 +29,7 @@
#include <set>
#include <string>
#include "../filter/videofilter.h"
#include "../../filter/videofilter.h"
#include <ft2build.h>
#include FT_FREETYPE_H

10
desmume/src/frontend/cocoa/cocoa_GPU.mm
View File

@ -20,14 +20,14 @@
#import "cocoa_globals.h"
#include "utilities.h"
#include "../NDSSystem.h"
#include "../GPU.h"
#include "../rasterize.h"
#include "../../NDSSystem.h"
#include "../../GPU.h"
#include "../../rasterize.h"
#ifdef MAC_OS_X_VERSION_10_7
#include "../OGLRender_3_2.h"
#include "../../OGLRender_3_2.h"
#else
#include "../OGLRender.h"
#include "../../OGLRender.h"
#endif
#include <OpenGL/OpenGL.h>

4
desmume/src/frontend/cocoa/cocoa_cheat.mm
View File

@ -20,8 +20,8 @@
#import "cocoa_globals.h"
#import "cocoa_util.h"
#include "../cheatSystem.h"
#include "../MMU.h"
#include "../../cheatSystem.h"
#include "../../MMU.h"
#undef BOOL
@implementation CocoaDSCheatItem

14
desmume/src/frontend/cocoa/cocoa_core.mm
View File

@ -28,13 +28,13 @@
#include <mach/mach.h>
#include <mach/mach_time.h>
#include "../movie.h"
#include "../NDSSystem.h"
#include "../armcpu.h"
#include "../driver.h"
#include "../gdbstub.h"
#include "../slot1.h"
#include "../slot2.h"
#include "../../movie.h"
#include "../../NDSSystem.h"
#include "../../armcpu.h"
#include "../../driver.h"
#include "../../gdbstub.h"
#include "../../slot1.h"
#include "../../slot2.h"
#undef BOOL
// Need to include assert.h this way so that GDB stub will work

10
desmume/src/frontend/cocoa/cocoa_file.mm
View File

@ -21,11 +21,11 @@
#import "cocoa_globals.h"
#import "cocoa_util.h"
#include "../NDSSystem.h"
#include "../MMU.h"
#include "../movie.h"
#include "../path.h"
#include "../saves.h"
#include "../../NDSSystem.h"
#include "../../MMU.h"
#include "../../movie.h"
#include "../../path.h"
#include "../../saves.h"
#undef BOOL
@implementation CocoaDSFile

4
desmume/src/frontend/cocoa/cocoa_firmware.mm
View File

@ -17,8 +17,8 @@
*/
#import "cocoa_firmware.h"
#include "../NDSSystem.h"
#include "../firmware.h"
#include "../../NDSSystem.h"
#include "../../firmware.h"
#undef BOOL

4
desmume/src/frontend/cocoa/cocoa_input.mm
View File

@ -22,8 +22,8 @@
#include "mic_ext.h"
#include "coreaudiosound.h"
#include "audiosamplegenerator.h"
#include "../NDSSystem.h"
#include "../slot2.h"
#include "../../NDSSystem.h"
#include "../../slot2.h"
#undef BOOL
NullGenerator nullSampleGenerator;

16
desmume/src/frontend/cocoa/cocoa_output.mm
View File

@ -23,14 +23,14 @@
#import "cocoa_core.h"
#include "sndOSX.h"
#include "../NDSSystem.h"
#include "../common.h"
#include "../GPU.h"
#include "../gfx3d.h"
#include "../SPU.h"
#include "../movie.h"
#include "../metaspu/metaspu.h"
#include "../rtc.h"
#include "../../NDSSystem.h"
#include "../../common.h"
#include "../../GPU.h"
#include "../../gfx3d.h"
#include "../../SPU.h"
#include "../../movie.h"
#include "../../metaspu/metaspu.h"
#include "../../rtc.h"
#import <Cocoa/Cocoa.h>

12
desmume/src/frontend/cocoa/cocoa_rom.mm
View File

@ -21,10 +21,10 @@
#import "cocoa_globals.h"
#import "cocoa_util.h"
#include "../NDSSystem.h"
#include "../GPU.h"
#include "../common.h"
#include "../mc.h"
#include "../../NDSSystem.h"
#include "../../GPU.h"
#include "../../Database.h"
#include "../../mc.h"
#undef BOOL
@ -349,7 +349,7 @@ static NSMutableDictionary *saveTypeValues = nil;
return nil;
}
return [NSString stringWithCString:getDeveloperNameByID(ndsRomHeader->makerCode).c_str() encoding:NSUTF8StringEncoding];
return [NSString stringWithCString:(Database::MakerNameForMakerCode(ndsRomHeader->makerCode, true)) encoding:NSUTF8StringEncoding];
}
- (NSString *) developerNameAndCode
@ -360,7 +360,7 @@ static NSMutableDictionary *saveTypeValues = nil;
return nil;
}
return [NSString stringWithFormat:@"%s [0x%04X]", getDeveloperNameByID(ndsRomHeader->makerCode).c_str(), ndsRomHeader->makerCode];
return [NSString stringWithFormat:@"%s [0x%04X]", Database::MakerNameForMakerCode(ndsRomHeader->makerCode, true), ndsRomHeader->makerCode];
}
- (NSString *) unitCodeStringUsingID:(NSInteger)unitCodeID

2
desmume/src/frontend/cocoa/cocoa_slot2.h
View File

@ -16,7 +16,7 @@
*/
#import <Cocoa/Cocoa.h>
#include "../slot2.h"
#include "../../slot2.h"
#undef BOOL
@interface CocoaDSSlot2Device : NSObject

2
desmume/src/frontend/cocoa/cocoa_util.mm
View File

@ -23,7 +23,7 @@
#include <sys/types.h>
#include <sys/sysctl.h>
#include "../version.h"
#include "../../version.h"
#undef BOOL

2
desmume/src/frontend/cocoa/cocoa_videofilter.h
View File

@ -17,7 +17,7 @@
*/
#import <Foundation/Foundation.h>
#include "../filter/videofilter.h"
#include "../../filter/videofilter.h"
#undef BOOL
@class NSImage;

4
desmume/src/frontend/cocoa/mic_ext.cpp
View File

@ -18,8 +18,8 @@
#import "cocoa_globals.h"
#include "mic_ext.h"
#include "../emufile.h"
#include "../readwrite.h"
#include "../../emufile.h"
#include "../../readwrite.h"
MicResetCallback _micResetCallback = &Mic_DefaultResetCallback;

2
desmume/src/frontend/cocoa/sndOSX.h
View File

@ -20,7 +20,7 @@
#define _OSXSOUNDINTERFACE_
#include <pthread.h>
#include "../SPU.h"
#include "../../SPU.h"
#undef BOOL
#define SNDCORE_OSX 58325 //hopefully this is unique number