Compare commits

...

3 Commits

Author SHA1 Message Date
rogerman
b962b925f5 Cocoa Port: Update CheatDatabaseViewer.xib to a file format that is compatible with Xcode 16. 2025-07-11 02:01:49 -07:00
rogerman
445060a0cc Cocoa Port: Update Xcode project files to reflect better build procedures.
- The main Xcode project disables Metal API Validation for Debug builds, since this seems to cause runtime issues on Xcode 16.
- The Xcode 3 project removes the git lookup build script for the PowerPC LLVM-Clang build, since the typical use case for this particular build won't have git commands available.
2025-07-11 01:43:54 -07:00
rogerman
557176faa3 Cocoa Port: Silence a compiler warning when building on older Xcode. 2025-07-11 00:45:08 -07:00
6 changed files with 559 additions and 1051 deletions

View File

@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -7737,6 +7737,7 @@
/* Begin PBXShellScriptBuildPhase section */
8C43E7AC27E3CD0100A35F65 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7751,6 +7752,7 @@
};
8C43E90A27E3CD4C00A35F65 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7765,6 +7767,7 @@
};
8C74E9BE27F39EDE00BF29F4 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7779,6 +7782,7 @@
};
8C74E9BF27F39F2C00BF29F4 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7793,6 +7797,7 @@
};
8C74E9C027F39F5300BF29F4 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7807,6 +7812,7 @@
};
AB2DF23215E0834E00B4D0BC /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7821,6 +7827,7 @@
};
AB2DF23515E0839D00B4D0BC /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7835,6 +7842,7 @@
};
AB497A2327F2E97A00E8A244 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7849,6 +7857,7 @@
};
AB79004B215B84E50082AE82 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7863,6 +7872,7 @@
};
AB7901A8215B84F20082AE82 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7877,6 +7887,7 @@
};
AB8F3C721A53AC2600A80BF6 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -7891,6 +7902,7 @@
};
ABC8589C28273FEE00A03EA9 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);

View File

@@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -50,6 +48,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
@@ -61,8 +60,6 @@
ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"

View File

@@ -48,6 +48,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">

View File

@@ -3827,7 +3827,6 @@
buildPhases = (
AB2F3B7B15CF9C6000858373 /* ShellScript */,
AB2F3B7C15CF9C6000858373 /* Resources */,
ABE76A8015E0904E00F458AE /* ShellScript */,
AB2F3BC415CF9C6000858373 /* Sources */,
AB2F3C3A15CF9C6000858373 /* Frameworks */,
);
@@ -4671,20 +4670,6 @@
shellPath = /bin/sh;
shellScript = "cd \"${SRCROOT}\"\nsh \"git-scmrev.sh\"";
};
ABE76A8015E0904E00F458AE /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/../svnrev.h",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"${SRCROOT}\"\nsh \"git-scmrev.sh\"";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */

View File

@@ -22,6 +22,7 @@
#if !defined(MAC_OS_X_VERSION_10_9)
#define NSOpenGLProfileVersion4_1Core 0x4100
#define kCGLOGLPVersion_GL4_Core 0x4100
#endif
@implementation DisplayViewOpenGLLayer
@@ -129,10 +130,6 @@ void MacOGLClientFetchObject::operator delete(void *ptr)
MacOGLClientFetchObject::MacOGLClientFetchObject()
{
const bool isMavericksSupported = IsOSXVersionSupported(10, 9, 0);
const bool isMountainLionSupported = (isMavericksSupported || IsOSXVersionSupported(10, 8, 0));
const bool isLionSupported = (isMountainLionSupported || IsOSXVersionSupported(10, 7, 0));
NSOpenGLPixelFormat *nsPixelFormat = nil;
bool useContext_3_2 = false;
@@ -163,6 +160,10 @@ MacOGLClientFetchObject::MacOGLClientFetchObject()
#ifdef _OGLDISPLAYOUTPUT_3_2_H_
// Request the latest context profile that is available on the system.
const bool isMavericksSupported = IsOSXVersionSupported(10, 9, 0);
const bool isMountainLionSupported = (isMavericksSupported || IsOSXVersionSupported(10, 8, 0));
const bool isLionSupported = (isMountainLionSupported || IsOSXVersionSupported(10, 7, 0));
if (isLionSupported)
{
attributes[10] = NSOpenGLPFAOpenGLProfile;
@@ -364,10 +365,6 @@ MacOGLDisplayPresenter::MacOGLDisplayPresenter(MacOGLClientFetchObject *fetchObj
void MacOGLDisplayPresenter::__InstanceInit(MacOGLClientFetchObject *fetchObject)
{
const bool isMavericksSupported = IsOSXVersionSupported(10, 9, 0);
const bool isMountainLionSupported = (isMavericksSupported || IsOSXVersionSupported(10, 8, 0));
const bool isLionSupported = (isMountainLionSupported || IsOSXVersionSupported(10, 7, 0));
_nsPixelFormat = nil;
// Initialize the OpenGL context.
@@ -398,6 +395,10 @@ void MacOGLDisplayPresenter::__InstanceInit(MacOGLClientFetchObject *fetchObject
#ifdef _OGLDISPLAYOUTPUT_3_2_H_
// Request the latest context profile that is available on the system.
const bool isMavericksSupported = IsOSXVersionSupported(10, 9, 0);
const bool isMountainLionSupported = (isMavericksSupported || IsOSXVersionSupported(10, 8, 0));
const bool isLionSupported = (isMountainLionSupported || IsOSXVersionSupported(10, 7, 0));
if (isLionSupported)
{
attributes[11] = NSOpenGLPFAOpenGLProfile;
@@ -468,7 +469,7 @@ void MacOGLDisplayPresenter::Init()
GLint profileVersion = 0;
CGLDescribePixelFormat(this->_pixelFormat, 0, kCGLPFAOpenGLProfile, &profileVersion);
if ( (profileVersion == kCGLOGLPVersion_3_2_Core) || (profileVersion == 0x4100) )
if ( (profileVersion == kCGLOGLPVersion_3_2_Core) || (profileVersion == kCGLOGLPVersion_GL4_Core) )
{
this->_contextInfo = new OGLContextInfo_3_2;
}