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

Update project and fix build.

Browse Source
This commit is contained in:
Colby Klein
2010-12-20 08:34:56 -08:00
parent a8de96107f
commit 05d42bf8de
3 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Xcode/stepmania.xcodeproj/project.pbxproj
+68 -4
View File
@@ -1633,6 +1633,19 @@
AAFF41A60F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = AAFF41A20F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.h */; };
EE2153A910A75BEE0074B01B /* NotesLoaderPMS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */; };
EE2153AA10A75BEE0074B01B /* NotesLoaderPMS.h in Headers */ = {isa = PBXBuildFile; fileRef = EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */; };
EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */; };
EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */; };
EE906F7712BF3A6900146C96 /* json_batchallocator.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F7012BF3A6900146C96 /* json_batchallocator.h */; };
EE906F7812BF3A6900146C96 /* json_internalarray.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7112BF3A6900146C96 /* json_internalarray.inl */; };
EE906F7912BF3A6900146C96 /* json_internalmap.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7212BF3A6900146C96 /* json_internalmap.inl */; };
EE906F7A12BF3A6900146C96 /* json_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7312BF3A6900146C96 /* json_reader.cpp */; };
EE906F7B12BF3A6900146C96 /* json_value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7412BF3A6900146C96 /* json_value.cpp */; };
EE906F7C12BF3A6900146C96 /* json_valueiterator.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7512BF3A6900146C96 /* json_valueiterator.inl */; };
EE906F7D12BF3A6900146C96 /* json_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7612BF3A6900146C96 /* json_writer.cpp */; };
EE906F8212BF3AF800146C96 /* JsonUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F8012BF3AF800146C96 /* JsonUtil.cpp */; };
EE906F8312BF3AF800146C96 /* JsonUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F8112BF3AF800146C96 /* JsonUtil.h */; };
EE906F8A12BF3C7C00146C96 /* FileDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F8812BF3C7C00146C96 /* FileDownload.cpp */; };
EE906F8B12BF3C7C00146C96 /* FileDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F8912BF3C7C00146C96 /* FileDownload.h */; };
EEA7C84310A805A300082E7B /* ScreenPackagesSSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA7C84110A805A300082E7B /* ScreenPackagesSSC.cpp */; };
EEA7C84410A805A300082E7B /* ScreenPackagesSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = EEA7C84210A805A300082E7B /* ScreenPackagesSSC.h */; };
EEC7863F0E58208B00F559BC /* StepsDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEC7863D0E58208B00F559BC /* StepsDisplay.cpp */; };
@@ -2959,6 +2972,19 @@
AAFF5542054E736D00D02EE9 /* Attack.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = Attack.h; path = ../src/Attack.h; sourceTree = "<group>"; };
EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesLoaderPMS.cpp; path = ../src/NotesLoaderPMS.cpp; sourceTree = SOURCE_ROOT; };
EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderPMS.h; path = ../src/NotesLoaderPMS.h; sourceTree = SOURCE_ROOT; };
EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenInstallOverlay.cpp; path = ../src/ScreenInstallOverlay.cpp; sourceTree = SOURCE_ROOT; };
EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenInstallOverlay.h; path = ../src/ScreenInstallOverlay.h; sourceTree = SOURCE_ROOT; };
EE906F7012BF3A6900146C96 /* json_batchallocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json_batchallocator.h; path = ../src/jsoncpp/src/lib_json/json_batchallocator.h; sourceTree = SOURCE_ROOT; };
EE906F7112BF3A6900146C96 /* json_internalarray.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalarray.inl; path = ../src/jsoncpp/src/lib_json/json_internalarray.inl; sourceTree = SOURCE_ROOT; };
EE906F7212BF3A6900146C96 /* json_internalmap.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalmap.inl; path = ../src/jsoncpp/src/lib_json/json_internalmap.inl; sourceTree = SOURCE_ROOT; };
EE906F7312BF3A6900146C96 /* json_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_reader.cpp; path = ../src/jsoncpp/src/lib_json/json_reader.cpp; sourceTree = SOURCE_ROOT; };
EE906F7412BF3A6900146C96 /* json_value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_value.cpp; path = ../src/jsoncpp/src/lib_json/json_value.cpp; sourceTree = SOURCE_ROOT; };
EE906F7512BF3A6900146C96 /* json_valueiterator.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_valueiterator.inl; path = ../src/jsoncpp/src/lib_json/json_valueiterator.inl; sourceTree = SOURCE_ROOT; };
EE906F7612BF3A6900146C96 /* json_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_writer.cpp; path = ../src/jsoncpp/src/lib_json/json_writer.cpp; sourceTree = SOURCE_ROOT; };
EE906F8012BF3AF800146C96 /* JsonUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JsonUtil.cpp; path = ../src/JsonUtil.cpp; sourceTree = SOURCE_ROOT; };
EE906F8112BF3AF800146C96 /* JsonUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JsonUtil.h; path = ../src/JsonUtil.h; sourceTree = SOURCE_ROOT; };
EE906F8812BF3C7C00146C96 /* FileDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownload.cpp; path = ../src/FileDownload.cpp; sourceTree = SOURCE_ROOT; };
EE906F8912BF3C7C00146C96 /* FileDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownload.h; path = ../src/FileDownload.h; sourceTree = SOURCE_ROOT; };
EEA7C84110A805A300082E7B /* ScreenPackagesSSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenPackagesSSC.cpp; path = ../src/ScreenPackagesSSC.cpp; sourceTree = SOURCE_ROOT; };
EEA7C84210A805A300082E7B /* ScreenPackagesSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenPackagesSSC.h; path = ../src/ScreenPackagesSSC.h; sourceTree = SOURCE_ROOT; };
EEC7863D0E58208B00F559BC /* StepsDisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StepsDisplay.cpp; path = ../src/StepsDisplay.cpp; sourceTree = "<group>"; };
@@ -3113,6 +3139,7 @@
29B97314FDCFA39411CA2CEA /* SDL App */ = {
isa = PBXGroup;
children = (
EE906F6F12BF3A5B00146C96 /* json */,
AAA070B20CE7B3AD005A3060 /* mad-0.15.1b */,
AA7C8B920B67467C00FD9940 /* libtomcrypt */,
AA7C8A7F0B6744F600FD9940 /* libtommath */,
@@ -3185,8 +3212,6 @@
AA6E00090477103E005F316C /* Screens */ = {
isa = PBXGroup;
children = (
36CA531E0F9156860063D59D /* ScreenOptionsEditCourse.cpp */,
36CA531F0F9156860063D59D /* ScreenOptionsEditCourse.h */,
AA6E000A047711F3005F316C /* Screen.cpp */,
AA6E000B047711F3005F316C /* Screen.h */,
AA6E0010047711F3005F316C /* ScreenAttract.cpp */,
@@ -3225,6 +3250,8 @@
367D575A0EDE56F200B46814 /* ScreenHighScores.h */,
AA6E002F047711F3005F316C /* ScreenHowToPlay.cpp */,
AA6E0030047711F3005F316C /* ScreenHowToPlay.h */,
EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */,
EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */,
AA6E0033047711F3005F316C /* ScreenInstructions.cpp */,
AA6E0034047711F3005F316C /* ScreenInstructions.h */,
AA6E0037047711F3005F316C /* ScreenJukebox.cpp */,
@@ -3251,6 +3278,10 @@
AA42F5E7067068D30013509E /* ScreenNetworkOptions.h */,
AA6E004B047711F3005F316C /* ScreenOptions.cpp */,
AA6E004C047711F3005F316C /* ScreenOptions.h */,
36CA531A0F91564A0063D59D /* ScreenOptionsCourseOverview.cpp */,
36CA531B0F91564A0063D59D /* ScreenOptionsCourseOverview.h */,
36CA531E0F9156860063D59D /* ScreenOptionsEditCourse.cpp */,
36CA531F0F9156860063D59D /* ScreenOptionsEditCourse.h */,
AAFAB5BB0889098600767BF7 /* ScreenOptionsEditProfile.cpp */,
AAFAB5BC0889098600767BF7 /* ScreenOptionsEditProfile.h */,
AAFF41A10F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.cpp */,
@@ -3320,8 +3351,6 @@
AA6E0079047711F3005F316C /* ScreenTestFonts.cpp */,
AA6E007A047711F3005F316C /* ScreenTestFonts.h */,
AAC622FA05389A0500D02EE9 /* ScreenTestInput.cpp */,
36CA531A0F91564A0063D59D /* ScreenOptionsCourseOverview.cpp */,
36CA531B0F91564A0063D59D /* ScreenOptionsCourseOverview.h */,
AAC622FB05389A0500D02EE9 /* ScreenTestInput.h */,
AAF7435906110E8D00B19AD1 /* ScreenTestLights.cpp */,
AAF7435A06110E8D00B19AD1 /* ScreenTestLights.h */,
@@ -3665,6 +3694,8 @@
AA6EFDC804770AF1005F316C /* DataStructures */ = {
isa = PBXGroup;
children = (
EE906F8812BF3C7C00146C96 /* FileDownload.cpp */,
EE906F8912BF3C7C00146C96 /* FileDownload.h */,
AA84B7050996F8370085EECB /* AdjustSync.cpp */,
AA84B7060996F8370085EECB /* AdjustSync.h */,
AAFF5541054E736D00D02EE9 /* Attack.cpp */,
@@ -3727,6 +3758,8 @@
AABBD80605D8E9FC00B44FC2 /* HighScore.cpp */,
AABBD80705D8E9FC00B44FC2 /* HighScore.h */,
AACFBE3908E7D832005087FC /* InputEventPlus.h */,
EE906F8012BF3AF800146C96 /* JsonUtil.cpp */,
EE906F8112BF3AF800146C96 /* JsonUtil.h */,
AA2FB638091212AF000FD574 /* LifeMeter.cpp */,
AADD1CC2095C233E0088C9DF /* LocalizedString.cpp */,
AADD1CC3095C233F0088C9DF /* LocalizedString.h */,
@@ -4862,6 +4895,20 @@
path = "../src/lua-5.1";
sourceTree = "<group>";
};
EE906F6F12BF3A5B00146C96 /* json */ = {
isa = PBXGroup;
children = (
EE906F7012BF3A6900146C96 /* json_batchallocator.h */,
EE906F7112BF3A6900146C96 /* json_internalarray.inl */,
EE906F7212BF3A6900146C96 /* json_internalmap.inl */,
EE906F7312BF3A6900146C96 /* json_reader.cpp */,
EE906F7412BF3A6900146C96 /* json_value.cpp */,
EE906F7512BF3A6900146C96 /* json_valueiterator.inl */,
EE906F7612BF3A6900146C96 /* json_writer.cpp */,
);
name = json;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -4877,6 +4924,10 @@
EEA7C84410A805A300082E7B /* ScreenPackagesSSC.h in Headers */,
36C6888411297FFE00453295 /* RageFileDriverReadAhead.h in Headers */,
36C6888611297FFE00453295 /* RageFileManager_ReadAhead.h in Headers */,
EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */,
EE906F7712BF3A6900146C96 /* json_batchallocator.h in Headers */,
EE906F8312BF3AF800146C96 /* JsonUtil.h in Headers */,
EE906F8B12BF3C7C00146C96 /* FileDownload.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5598,6 +5649,9 @@
AA29CD3E0558741A00961A51 /* smicon.icns in Resources */,
AAF6A2F909B695BA00D5C614 /* Localizable.strings in Resources */,
AA1DE9580C5468CE00D59F20 /* Hardware.plist in Resources */,
EE906F7812BF3A6900146C96 /* json_internalarray.inl in Resources */,
EE906F7912BF3A6900146C96 /* json_internalmap.inl in Resources */,
EE906F7C12BF3A6900146C96 /* json_valueiterator.inl in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6114,6 +6168,12 @@
EEA7C84310A805A300082E7B /* ScreenPackagesSSC.cpp in Sources */,
36C6888311297FFE00453295 /* RageFileDriverReadAhead.cpp in Sources */,
36C6888511297FFE00453295 /* RageFileManager_ReadAhead.cpp in Sources */,
EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */,
EE906F7A12BF3A6900146C96 /* json_reader.cpp in Sources */,
EE906F7B12BF3A6900146C96 /* json_value.cpp in Sources */,
EE906F7D12BF3A6900146C96 /* json_writer.cpp in Sources */,
EE906F8212BF3AF800146C96 /* JsonUtil.cpp in Sources */,
EE906F8A12BF3C7C00146C96 /* FileDownload.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7076,6 +7136,7 @@
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = "non-global";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src/jsoncpp/include";
};
name = Debug;
};
@@ -7607,6 +7668,7 @@
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src/jsoncpp/include";
};
name = PerformanceDebug;
};
@@ -7937,6 +7999,7 @@
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src/jsoncpp/include";
};
name = Native;
};
@@ -8062,6 +8125,7 @@
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
STRIP_INSTALLED_PRODUCT = YES;
STRIP_STYLE = "non-global";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src/jsoncpp/include";
};
name = Universal;
};
src/arch/Dialog/Dialog.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ DialogDriver *MakeDialogDriver()
sDriver = asDriversToTry[i];
#ifdef USE_DIALOG_DRIVER_COCOA
if( !asDriversToTry[i].CompareNoCase("Cocoa") ) pRet = new DialogDriver_Cocoa;
if( !asDriversToTry[i].CompareNoCase("Cocoa") ) pRet = new DialogDriver_MacOSX;
#endif
#ifdef USE_DIALOG_DRIVER_WIN32
if( !asDriversToTry[i].CompareNoCase("Win32") ) pRet = new DialogDriver_Win32;
src/arch/Dialog/Selector_Dialog.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include "DialogDriver_Win32.h"
#elif defined(MACOSX)
#include "DialogDriver_Cocoa.h"
#include "DialogDriver_MacOSX.h"
#endif
#include "DialogDriver.h" // DialogDriver_Null is in here