Added separate build project for OSX Intel machines running Leopard (10.5)

or newer.  Obviously, this one only runs on x86 machines.  It's compiled
with the very latest compiler (Clang), which is much faster at compiling
as well as runtime.  And it also includes a 64-bit version, which is
only available on Snow Leopard.  The old build environment support 32-bit
in 10.4, 10.5 and 10.6 for PPC and Intel.

Fixed string overflow in reading settings from plist file in OSX.  I need
to figure out how to use C++ code from within Objective-C, since the
cause of the bug was C string code (which is notorious for buffer
overruns).

Bumped version # to test2, for some testers on AtariAge.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1904 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2009-11-12 17:23:02 +00:00
parent 77a83388c2
commit 4ac82ca56a
6 changed files with 1891 additions and 19 deletions

View File

@ -21,7 +21,7 @@
#include <cstdlib>
#define STELLA_BASE_VERSION "3.1_test1"
#define STELLA_BASE_VERSION "3.1_test2"
#ifdef NIGHTLY_BUILD
#define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD

View File

@ -58,5 +58,14 @@
<string>NSApplication</string>
<key>«PROJECTNAMEASXML»</key>
<string>SDL Cocoa App</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>x86_64</key>
<string>10.6.0</string>
<key>i386</key>
<string>10.5.0</string>
<key>ppc</key>
<string>10.4.0</string>
</dict>
</dict>
</plist>

View File

@ -56,13 +56,13 @@ SettingsMACOSX::~SettingsMACOSX()
void SettingsMACOSX::loadConfig()
{
string key, value;
char cvalue[2048];
char cvalue[4096];
// Read key/value pairs from the plist file
const SettingsArray& settings = getInternalSettings();
for(unsigned int i = 0; i < settings.size(); ++i)
{
prefsGetString(settings[i].key.c_str(), cvalue, 2047);
prefsGetString(settings[i].key.c_str(), cvalue, 4090);
if(cvalue[0] != 0)
setInternal(settings[i].key, cvalue, i, true);
}

View File

@ -1389,7 +1389,6 @@
2D91747309BA90380026E9FF /* Sources */,
2D91750E09BA90380026E9FF /* Frameworks */,
2D91751309BA90380026E9FF /* CopyFiles */,
2D91751509BA90380026E9FF /* ShellScript */,
DCCC0C9609C354660088BFF1 /* CopyFiles */,
);
buildRules = (
@ -1453,19 +1452,6 @@
shellPath = /bin/sh;
shellScript = "m4 ../emucore/m6502/src/M6502.m4 > M6502.ins\n";
};
2D91751509BA90380026E9FF /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cp ../../docs/index.html build/Deployment/StellaOSX.app/Contents/Resources/docs/index.html;\n";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@ -1816,20 +1802,21 @@
.,
"$(HOME)/Library/Frameworks",
);
GCC_VERSION = 4.2;
};
name = Development;
};
2D91752309BA903B0026E9FF /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
FRAMEWORK_SEARCH_PATHS = (
.,
"$(HOME)/Library/Frameworks",
);
GCC_ENABLE_CPP_RTTI = NO;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_VERSION = 4.2;
MACOSX_DEPLOYMENT_TARGET = "";
};
name = Deployment;
@ -1838,6 +1825,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_VERSION = 4.2;
MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = macosx10.4;
};

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Description</key>
<string>This project builds an SDL-based application with Cocoa menus.</string>
<key>FilesToMacroExpand</key>
<array>
<string>English.lproj/InfoPlist.strings</string>
</array>
</dict>
</plist>

File diff suppressed because it is too large Load Diff