From 6f366846fec7a892b3d654b9e11c87f073c0c69d Mon Sep 17 00:00:00 2001 From: stephena Date: Fri, 20 Jun 2014 14:29:05 +0000 Subject: [PATCH] More OSX Xcode 5 updates. The project file now builds both 32 and 64-bit Universal Binaries, and there is now a development and deployment target. Finally, the build DMG script now works again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2930 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Announce.txt | 3 +-- src/macosx/Create_build.sh | 2 +- src/macosx/Info-Stella.plist | 2 +- src/macosx/stella.xcodeproj/project.pbxproj | 8 +++----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Announce.txt b/Announce.txt index 9109284b4..27ae804b2 100644 --- a/Announce.txt +++ b/Announce.txt @@ -30,8 +30,7 @@ distributions currently available are: Stella-4.0-windows.zip (32/64 bit versions) * Binary distribution for MacOS X 32-bit & 64-bit : - Stella-4.0-macosx.dmg (32-bit Universal Binary) - Stella-4.0_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+) + Stella-4.0-macosx.dmg (32/64-bit Intel/OSX 10.5+) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : stella_4.0-1_i386.deb diff --git a/src/macosx/Create_build.sh b/src/macosx/Create_build.sh index ec2054274..c6e0652ef 100755 --- a/src/macosx/Create_build.sh +++ b/src/macosx/Create_build.sh @@ -26,7 +26,7 @@ echo "Copying documentation ..." ditto ../../Announce.txt ../../Changes.txt ../../Copyright.txt ../../License.txt ../../Readme.txt ../../Todo.txt "${DISK}" echo "Copying application ..." -cp -r build/Deployment/Stella.app "${DISK}" +cp -r DerivedData/Build/Products/Deployment/Stella.app "${DISK}" echo "Updating modification times ..." touch "${DISK}"/Stella.app "${DISK}"/*.txt diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist index 9bb85d1f4..f631924af 100644 --- a/src/macosx/Info-Stella.plist +++ b/src/macosx/Info-Stella.plist @@ -57,7 +57,7 @@ LSMinimumSystemVersionByArchitecture i386 - 10.4.0 + 10.5.0 x86_64 10.6.0 diff --git a/src/macosx/stella.xcodeproj/project.pbxproj b/src/macosx/stella.xcodeproj/project.pbxproj index 94a4d0844..852247585 100644 --- a/src/macosx/stella.xcodeproj/project.pbxproj +++ b/src/macosx/stella.xcodeproj/project.pbxproj @@ -607,7 +607,6 @@ 2D403BA5086116D1001E31A1 /* EditTextWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = EditTextWidget.hxx; path = ../gui/EditTextWidget.hxx; sourceTree = SOURCE_ROOT; }; 2D403BCE08611A69001E31A1 /* PackedBitArray.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = PackedBitArray.cxx; path = ../debugger/PackedBitArray.cxx; sourceTree = SOURCE_ROOT; }; 2D403BCF08611A69001E31A1 /* PackedBitArray.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = PackedBitArray.hxx; path = ../debugger/PackedBitArray.hxx; sourceTree = SOURCE_ROOT; }; - 2D4764C806683C5F00F63D87 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL.framework; sourceTree = SOURCE_ROOT; }; 2D659E2D085D3DD6005D96C8 /* Debugger.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Debugger.cxx; path = ../debugger/Debugger.cxx; sourceTree = SOURCE_ROOT; }; 2D659E2E085D3DD6005D96C8 /* Debugger.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = Debugger.hxx; path = ../debugger/Debugger.hxx; sourceTree = SOURCE_ROOT; }; 2D659E31085D3DD6005D96C8 /* DebuggerParser.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DebuggerParser.cxx; path = ../debugger/DebuggerParser.cxx; sourceTree = SOURCE_ROOT; }; @@ -1084,7 +1083,6 @@ isa = PBXGroup; children = ( 2D17D98E08BC398400E47F69 /* ApplicationServices.framework */, - 2D4764C806683C5F00F63D87 /* SDL.framework */, 2DEB3D4C0629BD24007EBBD3 /* OpenGL.framework */, 29B97325FDCFA39411CA2CEA /* Foundation.framework */, 29B97324FDCFA39411CA2CEA /* AppKit.framework */, @@ -2309,7 +2307,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_INTTYPES, HAVE_GETTIMEOFDAY, - DISPLAY_OPENGL, CHEATCODE_SUPPORT, DEBUGGER_SUPPORT, JOYSTICK_SUPPORT, @@ -2362,7 +2359,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_INTTYPES, HAVE_GETTIMEOFDAY, - DISPLAY_OPENGL, CHEATCODE_SUPPORT, DEBUGGER_SUPPORT, JOYSTICK_SUPPORT, @@ -2414,7 +2410,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_INTTYPES, HAVE_GETTIMEOFDAY, - DISPLAY_OPENGL, CHEATCODE_SUPPORT, DEBUGGER_SUPPORT, JOYSTICK_SUPPORT, @@ -2455,6 +2450,7 @@ 2D91752209BA903B0026E9FF /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -2486,6 +2482,7 @@ 2D91752309BA903B0026E9FF /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -2516,6 +2513,7 @@ 2D91752409BA903B0026E9FF /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES;