actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring Xcode up to 4.6 standards.

Browse Source 
Basically includes hi def image stuff and headers.

Note: Mac OS X build is broken. LowLevelWindow_MacOSX.mm refers to the removed RageDisplay_Legacy_Helpers files. The replacement is not immediately obvious.
This commit is contained in:
Jason Felds
2013-02-10 01:10:01 -05:00
parent 73db99db54
commit d7518ef5b3
2 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Xcode/stepmania_xcode4.3.xcodeproj/project.pbxproj
+49 -10
View File
@@ -6222,7 +6222,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0430;
LastUpgradeCheck = 0460;
};
buildConfigurationList = AAC845130856A19700A9FEAB /* Build configuration list for PBXProject "stepmania_xcode4.3" */;
compatibilityVersion = "Xcode 3.2";
@@ -7776,6 +7776,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -7817,6 +7818,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -7858,6 +7860,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -7902,6 +7905,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -7942,6 +7946,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -7982,6 +7987,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -8026,6 +8032,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = "";
@@ -8066,6 +8073,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = "";
@@ -8106,6 +8114,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -8149,6 +8158,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
@@ -8195,6 +8205,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
@@ -8241,6 +8252,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -8289,6 +8301,7 @@
AA0AA8FE0963CF7700427F4D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -8315,6 +8328,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
@@ -8343,7 +8357,7 @@
"\"$(SRCROOT)/ffmpeg/lib\"",
);
LINKER_DISPLAYS_MANGLED_NAMES = NO;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
OBJROOT = "$(SRCROOT)/build";
OTHER_CPLUSPLUSFLAGS = (
"-finline-limit=300",
@@ -8398,9 +8412,9 @@
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Libraries";
LINKER_DISPLAYS_MANGLED_NAMES = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
SDKROOT = macosx10.6;
SDKROOT = "";
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = "non-global";
@@ -8412,6 +8426,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/Frameworks",
"$(SYSTEM_LIBRARY_DIR)/Frameworks",
@@ -8460,6 +8475,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/Frameworks",
"$(SYSTEM_LIBRARY_DIR)/Frameworks",
@@ -8575,6 +8591,7 @@
AA7A2BBE0AE09D4E0054C5BA /* Native */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "all lua";
};
name = Native;
@@ -8582,6 +8599,7 @@
AA7A2BC00AE09D4E0054C5BA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -8593,6 +8611,7 @@
AA7C89820B67447E00FD9940 /* Native */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_DYNAMIC_NO_PIC = YES;
GCC_MODEL_TUNING = G5;
@@ -8608,6 +8627,7 @@
AA7C89840B67447E00FD9940 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_DYNAMIC_NO_PIC = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -8625,6 +8645,7 @@
AA7C8B8F0B67464300FD9940 /* Native */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
DEAD_CODE_STRIPPING = NO;
GCC_DYNAMIC_NO_PIC = YES;
@@ -8642,6 +8663,7 @@
AA7C8B910B67464300FD9940 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
DEAD_CODE_STRIPPING = NO;
GCC_DYNAMIC_NO_PIC = YES;
@@ -8663,6 +8685,7 @@
AAA070AA0CE7B0E2005A3060 /* Native */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
FPM = "";
"FPM[arch=i386]" = FPM_INTEL;
@@ -8697,6 +8720,7 @@
AAA070AB0CE7B0E2005A3060 /* PerformanceDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
FPM = "";
"FPM[arch=i386]" = FPM_INTEL;
@@ -8731,6 +8755,7 @@
AAA070AD0CE7B0E2005A3060 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
FPM = "";
@@ -8803,9 +8828,9 @@
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Libraries";
LINKER_DISPLAYS_MANGLED_NAMES = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
SDKROOT = macosx10.6;
SDKROOT = "";
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
@@ -8817,6 +8842,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = stabs;
@@ -8848,7 +8874,7 @@
"\"$(SRCROOT)/ffmpeg/lib\"",
);
LINKER_DISPLAYS_MANGLED_NAMES = NO;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
OBJROOT = "$(SRCROOT)/build";
OTHER_CPLUSPLUSFLAGS = (
"-finline-limit=300",
@@ -8867,6 +8893,7 @@
AABF4DBC0CD37960005A3060 /* PerformanceDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -8893,6 +8920,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/Frameworks",
"$(SYSTEM_LIBRARY_DIR)/Frameworks",
@@ -8940,6 +8968,7 @@
AABF4DBE0CD37960005A3060 /* PerformanceDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_DEBUGGING_SYMBOLS = full;
GCC_DYNAMIC_NO_PIC = YES;
@@ -8998,6 +9027,7 @@
AABF4DC10CD37960005A3060 /* PerformanceDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "all lua";
};
name = PerformanceDebug;
@@ -9005,6 +9035,7 @@
AABF4DC20CD37960005A3060 /* PerformanceDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_DYNAMIC_NO_PIC = YES;
GCC_MODEL_TUNING = G5;
@@ -9020,6 +9051,7 @@
AABF4DC30CD37960005A3060 /* PerformanceDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
DEAD_CODE_STRIPPING = NO;
GCC_DYNAMIC_NO_PIC = YES;
@@ -9037,6 +9069,7 @@
AAC8450D0856A19700A9FEAB /* Native */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -9063,6 +9096,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
@@ -9087,7 +9121,7 @@
"\"$(SRCROOT)/ffmpeg/lib\"",
);
LINKER_DISPLAYS_MANGLED_NAMES = NO;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
OBJROOT = "$(SRCROOT)/build";
OTHER_CPLUSPLUSFLAGS = (
"-finline-limit=300",
@@ -9140,9 +9174,9 @@
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Libraries";
LINKER_DISPLAYS_MANGLED_NAMES = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
SDKROOT = macosx10.6;
SDKROOT = "";
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
@@ -9153,6 +9187,7 @@
AAE781800AC7E3BF00AEFC64 /* Native */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_DEBUGGING_SYMBOLS = full;
GCC_DYNAMIC_NO_PIC = YES;
@@ -9178,6 +9213,7 @@
AAE781820AC7E3BF00AEFC64 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_DEBUGGING_SYMBOLS = full;
GCC_DYNAMIC_NO_PIC = YES;
@@ -9205,6 +9241,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -9244,6 +9281,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -9283,6 +9321,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
src/arch/Sound/RageSoundDriver_AU.cpp
+2
View File
@@ -4,6 +4,8 @@
#include "PrefsManager.h"
#include "archutils/Darwin/DarwinThreadHelpers.h"
#include <CoreServices/CoreServices.h>
#include <AudioToolbox/AudioServices.h>
#include <CoreAudio/CoreAudio.h>
REGISTER_SOUND_DRIVER_CLASS2( AudioUnit, AU );