From 1c8436ec911e884867e0bf9232175cde30507d53 Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Wed, 23 Jul 2014 12:47:56 +0900 Subject: [PATCH] Make StepMania compile in Xcode 5.1.1 project: - Mac OS X 10.6 SDK is used. - Architecture has been set to 32-bit. Otherwise, `MemoryCardDriverThreaded_MacOSX` and `HIDDevice` will not compile. - Replaced the outdated `README` file with a new `README.md`. libmad: - Use FPM_64BIT instead of FPM_INTEL. Otherwise, it will not compile. Also, latest Xcode seems not to support `$(...)` expansion in defining macros. Instead, they are hardcoded in the build settings. stepmania: - Removed compiler flags `-finline-limit` and `-falign-loops=16` --- Xcode/README | 22 ------------------ Xcode/README.md | 11 +++++++++ Xcode/stepmania.xcodeproj/project.pbxproj | 27 ++++++++--------------- 3 files changed, 20 insertions(+), 40 deletions(-) delete mode 100644 Xcode/README create mode 100644 Xcode/README.md diff --git a/Xcode/README b/Xcode/README deleted file mode 100644 index 4ec9d2cc87..0000000000 --- a/Xcode/README +++ /dev/null @@ -1,22 +0,0 @@ -REQUIREMENTS -Mac OS X 10.5 or higher is required. The Mac OS X 10.3.9 SDK needs to be -installed. - -Xcode 3.0 or higher is required to build. Even though the stepmania project -appears to be a ProjectBuilder project, it has been updated by XCode and -no longer works with ProjectBuilder. - -BUILD -1. Download StepMania from sourceforge. -2. Build StepMania by running: -$ xcodebuild -target stepmania -configuration Native -in the PBProject directory. -To build a universal binary instead, use "-configuration Universal" -instead of "-configuration Native" -3. (Optional) Run: -$ strip -x StepMania.app/Contents/MacOS/StepMania -to reduce the size of the binary. - -Steve Checkoway -stevecheckoway@users.sf.net - diff --git a/Xcode/README.md b/Xcode/README.md new file mode 100644 index 0000000000..d0ca46dcd1 --- /dev/null +++ b/Xcode/README.md @@ -0,0 +1,11 @@ + +StepMania Xcode Project +======================= + + +Mac OS X 10.6 SDK +----------------- + +StepMania requires Mac OS X 10.6 SDK to build. +See this [comment](https://github.com/stepmania/stepmania/issues/224#issuecomment-48857894) on how to install 10.6 SDK in Xcode. + diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index ae4340b24a..483c0775d6 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -8346,10 +8346,8 @@ LINKER_DISPLAYS_MANGLED_NAMES = NO; OBJROOT = "$(SRCROOT)/build"; OTHER_CPLUSPLUSFLAGS = ( - "-finline-limit=300", "-fconstant-cfstrings", "-fno-exceptions", - "-falign-loops=16", ); OTHER_LDFLAGS = "-lbz2"; PRODUCT_NAME = "StepMania (Debug)"; @@ -8360,6 +8358,7 @@ AA0AA9000963CF7700427F4D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; @@ -8390,7 +8389,7 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - SDKROOT = ""; + SDKROOT = macosx10.6; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = "non-global"; @@ -8651,8 +8650,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; - FPM = ""; - "FPM[arch=i386]" = FPM_INTEL; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = ( "HAVE_ASSERT_H=1", @@ -8664,7 +8661,7 @@ "HAVE_MEMORY_H=1", "HAVE_WAITPID=1", "SIZEOF_LONG=4", - "$(FPM)", + "FPM_INTEL=1", ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; @@ -8683,8 +8680,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; - FPM = ""; - "FPM[arch=i386]" = FPM_INTEL; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = ( "HAVE_ASSERT_H=1", @@ -8696,7 +8691,7 @@ "HAVE_MEMORY_H=1", "HAVE_WAITPID=1", "SIZEOF_LONG=4", - "$(FPM)", + "FPM_INTEL=1", ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; @@ -8715,8 +8710,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; - FPM = ""; - "FPM[arch=i386]" = FPM_INTEL; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -8729,7 +8722,7 @@ "HAVE_MEMORY_H=1", "HAVE_WAITPID=1", "SIZEOF_LONG=4", - "$(FPM)", + "FPM_INTEL=1", ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; @@ -8746,6 +8739,7 @@ AABF4DBA0CD37960005A3060 /* PerformanceDebug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; DEAD_CODE_STRIPPING = YES; EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = "*.nib *.lproj *.framework *.gch *.xcode* (*) CVS .svn .hg .git"; @@ -8776,7 +8770,7 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - SDKROOT = ""; + SDKROOT = macosx10.6; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_STYLE = "non-global"; USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../extern/glew-1.5.8/include $(PROJECT_DIR)/../extern/jsoncpp/include $(PROJECT_DIR)/../extern/vorbis"; @@ -8821,10 +8815,8 @@ LINKER_DISPLAYS_MANGLED_NAMES = NO; OBJROOT = "$(SRCROOT)/build"; OTHER_CPLUSPLUSFLAGS = ( - "-finline-limit=300", "-fconstant-cfstrings", "-fno-exceptions", - "-falign-loops=16", ); OTHER_LDFLAGS = "-lbz2"; PRODUCT_NAME = "StepMania (Performance-Debug)"; @@ -9040,10 +9032,8 @@ LINKER_DISPLAYS_MANGLED_NAMES = NO; OBJROOT = "$(SRCROOT)/build"; OTHER_CPLUSPLUSFLAGS = ( - "-finline-limit=300", "-fconstant-cfstrings", "-fno-exceptions", - "-falign-loops=16", ); OTHER_LDFLAGS = "-lbz2"; PRODUCT_NAME = StepMania; @@ -9054,6 +9044,7 @@ AAC845150856A19700A9FEAB /* Native */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; DEAD_CODE_STRIPPING = YES; EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = "*.nib *.lproj *.framework *.gch *.xcode* (*) CVS .svn .hg .git"; @@ -9084,7 +9075,7 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - SDKROOT = ""; + SDKROOT = macosx10.6; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_STYLE = "non-global"; USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../extern/glew-1.5.8/include $(PROJECT_DIR)/../extern/jsoncpp/include $(PROJECT_DIR)/../extern/vorbis";