[opengl] merge (part 1?)

This commit is contained in:
Colby Klein
2011-03-16 23:27:50 -07:00
1907 changed files with 435325 additions and 434234 deletions
File diff suppressed because it is too large Load Diff
+15 -15
View File
@@ -1,15 +1,15 @@
#!/bin/sh
for i in ffmpeg/libavcodec/ppc/*.[hc] \
ffmpeg/libswscale/yuv2rgb_altivec.c; do
sed -i '' -e '1i\
#ifdef __ppc__
$a\
#endif' $i
done
for i in ffmpeg/libavcodec/i386/*.[hc]; do
sed -i '' -e '1i\
#ifdef __i386__
$a\
#endif' $i
done
#!/bin/sh
for i in ffmpeg/libavcodec/ppc/*.[hc] \
ffmpeg/libswscale/yuv2rgb_altivec.c; do
sed -i '' -e '1i\
#ifdef __ppc__
$a\
#endif' $i
done
for i in ffmpeg/libavcodec/i386/*.[hc]; do
sed -i '' -e '1i\
#ifdef __i386__
$a\
#endif' $i
done
+30 -30
View File
@@ -1,30 +1,30 @@
#import <Cocoa/Cocoa.h>
BOOL NeedsPrivs( NSString *path );
NSString *CopyWithPrivs( NSString *src, NSString *dest );
NSString *Copy( NSString *src, NSString *dest );
/*
* (c) 2006 Steve Checkoway
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#import <Cocoa/Cocoa.h>
BOOL NeedsPrivs( NSString *path );
NSString *CopyWithPrivs( NSString *src, NSString *dest );
NSString *Copy( NSString *src, NSString *dest );
/*
* (c) 2006 Steve Checkoway
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
+11 -11
View File
@@ -1,11 +1,11 @@
# The format of this file is:
# Application name
# Bundle ID
# version1
# version2
# ...
# The version key -ALL- or no version keys matches all versions.
StepMania
com.StepMania
-ALL-
# The format of this file is:
# Application name
# Bundle ID
# version1
# version2
# ...
# The version key -ALL- or no version keys matches all versions.
StepMania
com.StepMania
-ALL-
+56 -56
View File
@@ -1,56 +1,56 @@
/* Upgrader */
#import <Cocoa/Cocoa.h>
@interface Upgrader : NSObject
{
IBOutlet NSButton *m_Choose;
IBOutlet NSButton *m_Okay;
IBOutlet NSPanel *m_Panel;
IBOutlet NSProgressIndicator *m_ProgressBar;
IBOutlet NSProgressIndicator *m_Searching;
IBOutlet NSTextField *m_StatusText;
IBOutlet NSTextField *m_SelectionText;
IBOutlet NSTextField *m_PatchingText;
IBOutlet NSWindow *m_Window;
NSString *m_sAppID;
NSArray *m_vVersions;
NSString *m_sName;
NSString *m_sError;
NSString *m_sPath;
}
- (IBAction) chooseFile:(id)sender;
- (IBAction) upgrade:(id)sender;
- (void) findApp:(id)obj;
- (void) foundApp:(id)obj;
- (void) upgradeFile:(id)path;
- (void) sheetEnded:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
- (BOOL) panel:(id)sender isValidFilename:(NSString *)filename;
- (BOOL) panel:(id)sender shouldShowFilename:(NSString *)filename;
- (BOOL) checkPath:(NSString *)path;
@end
/*
* (c) 2006 Steve Checkoway
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* Upgrader */
#import <Cocoa/Cocoa.h>
@interface Upgrader : NSObject
{
IBOutlet NSButton *m_Choose;
IBOutlet NSButton *m_Okay;
IBOutlet NSPanel *m_Panel;
IBOutlet NSProgressIndicator *m_ProgressBar;
IBOutlet NSProgressIndicator *m_Searching;
IBOutlet NSTextField *m_StatusText;
IBOutlet NSTextField *m_SelectionText;
IBOutlet NSTextField *m_PatchingText;
IBOutlet NSWindow *m_Window;
NSString *m_sAppID;
NSArray *m_vVersions;
NSString *m_sName;
NSString *m_sError;
NSString *m_sPath;
}
- (IBAction) chooseFile:(id)sender;
- (IBAction) upgrade:(id)sender;
- (void) findApp:(id)obj;
- (void) foundApp:(id)obj;
- (void) upgradeFile:(id)path;
- (void) sheetEnded:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
- (BOOL) panel:(id)sender isValidFilename:(NSString *)filename;
- (BOOL) panel:(id)sender shouldShowFilename:(NSString *)filename;
- (BOOL) checkPath:(NSString *)path;
@end
/*
* (c) 2006 Steve Checkoway
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
+38 -22
View File
@@ -25,6 +25,8 @@
1215D7A208C6559A00B87D8B /* ScreenGameplayNormal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1215D7A008C6559A00B87D8B /* ScreenGameplayNormal.cpp */; };
2B30D6821315EA7E00044B68 /* MouseDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B30D6801315EA7E00044B68 /* MouseDevice.cpp */; };
2B30D6831315EA7E00044B68 /* MouseDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B30D6811315EA7E00044B68 /* MouseDevice.h */; };
2B76698B132FF71500586512 /* NotesLoaderSMA.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B766989132FF71500586512 /* NotesLoaderSMA.h */; };
2B76698C132FF71500586512 /* NotesLoaderSMA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B76698A132FF71500586512 /* NotesLoaderSMA.cpp */; };
2BA7925E1304F20D002BD8E1 /* NotesLoaderSSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BA7925A1304F20D002BD8E1 /* NotesLoaderSSC.cpp */; };
2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */; };
2BA792601304F20D002BD8E1 /* NotesWriterSSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */; };
@@ -1774,6 +1776,8 @@
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
2B30D6801315EA7E00044B68 /* MouseDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseDevice.cpp; sourceTree = "<group>"; };
2B30D6811315EA7E00044B68 /* MouseDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MouseDevice.h; sourceTree = "<group>"; };
2B766989132FF71500586512 /* NotesLoaderSMA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderSMA.h; path = ../src/NotesLoaderSMA.h; sourceTree = SOURCE_ROOT; };
2B76698A132FF71500586512 /* NotesLoaderSMA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesLoaderSMA.cpp; path = ../src/NotesLoaderSMA.cpp; sourceTree = SOURCE_ROOT; };
2BA7925A1304F20D002BD8E1 /* NotesLoaderSSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesLoaderSSC.cpp; path = ../src/NotesLoaderSSC.cpp; sourceTree = SOURCE_ROOT; };
2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderSSC.h; path = ../src/NotesLoaderSSC.h; sourceTree = SOURCE_ROOT; };
2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesWriterSSC.cpp; path = ../src/NotesWriterSSC.cpp; sourceTree = SOURCE_ROOT; };
@@ -3153,6 +3157,7 @@
AA6EFDC804770AF1005F316C /* DataStructures */,
AA6EFE5704770C7E005F316C /* FileTypes */,
AA6E00FE047711FF005F316C /* GlobalSingletons */,
2B766980132FF62B00586512 /* NoteParsing */,
29B97315FDCFA39411CA2CEA /* Other Source */,
AA8B6C7804AFD82B00D02EE9 /* pcre */,
AA6EFDBB04770A83005F316C /* Rage */,
@@ -3200,6 +3205,37 @@
name = Frameworks;
sourceTree = "<group>";
};
2B766980132FF62B00586512 /* NoteParsing */ = {
isa = PBXGroup;
children = (
AA6EFDED04770C79005F316C /* NotesLoader.cpp */,
AA6EFDEE04770C79005F316C /* NotesLoader.h */,
AA6EFDEF04770C79005F316C /* NotesLoaderBMS.cpp */,
AA6EFDF004770C79005F316C /* NotesLoaderBMS.h */,
AA6EFDF104770C79005F316C /* NotesLoaderDWI.cpp */,
AA6EFDF204770C79005F316C /* NotesLoaderDWI.h */,
AA6EFDF304770C79005F316C /* NotesLoaderKSF.cpp */,
AA6EFDF404770C79005F316C /* NotesLoaderKSF.h */,
3688B8510BD42DAA004186AD /* NotesLoaderMidi.cpp */,
3688B8520BD42DAA004186AD /* NotesLoaderMidi.h */,
EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */,
EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */,
AA6EFDF504770C79005F316C /* NotesLoaderSM.cpp */,
AA6EFDF604770C79005F316C /* NotesLoaderSM.h */,
2B76698A132FF71500586512 /* NotesLoaderSMA.cpp */,
2B766989132FF71500586512 /* NotesLoaderSMA.h */,
2BA7925A1304F20D002BD8E1 /* NotesLoaderSSC.cpp */,
2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */,
AA6EFDF704770C79005F316C /* NotesWriterDWI.cpp */,
AA6EFDF804770C79005F316C /* NotesWriterDWI.h */,
AA6EFDF904770C79005F316C /* NotesWriterSM.cpp */,
AA6EFDFA04770C79005F316C /* NotesWriterSM.h */,
2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */,
2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */,
);
name = NoteParsing;
sourceTree = "<group>";
};
AA60E0BB067992D7008ADC41 /* Threads */ = {
isa = PBXGroup;
children = (
@@ -3774,28 +3810,6 @@
AA4F38C104E2D0B700D02EE9 /* NoteDataUtil.h */,
AA6EFDE704770C79005F316C /* NoteDataWithScoring.cpp */,
AA6EFDE804770C79005F316C /* NoteDataWithScoring.h */,
AA6EFDED04770C79005F316C /* NotesLoader.cpp */,
AA6EFDEE04770C79005F316C /* NotesLoader.h */,
AA6EFDEF04770C79005F316C /* NotesLoaderBMS.cpp */,
AA6EFDF004770C79005F316C /* NotesLoaderBMS.h */,
AA6EFDF104770C79005F316C /* NotesLoaderDWI.cpp */,
AA6EFDF204770C79005F316C /* NotesLoaderDWI.h */,
AA6EFDF304770C79005F316C /* NotesLoaderKSF.cpp */,
AA6EFDF404770C79005F316C /* NotesLoaderKSF.h */,
3688B8510BD42DAA004186AD /* NotesLoaderMidi.cpp */,
3688B8520BD42DAA004186AD /* NotesLoaderMidi.h */,
EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */,
EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */,
AA6EFDF504770C79005F316C /* NotesLoaderSM.cpp */,
AA6EFDF604770C79005F316C /* NotesLoaderSM.h */,
2BA7925A1304F20D002BD8E1 /* NotesLoaderSSC.cpp */,
2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */,
AA6EFDF704770C79005F316C /* NotesWriterDWI.cpp */,
AA6EFDF804770C79005F316C /* NotesWriterDWI.h */,
AA6EFDF904770C79005F316C /* NotesWriterSM.cpp */,
AA6EFDFA04770C79005F316C /* NotesWriterSM.h */,
2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */,
2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */,
AA6EFDFB04770C79005F316C /* NoteTypes.cpp */,
AA6EFDFC04770C79005F316C /* NoteTypes.h */,
AA80C75707F20D6600C99272 /* OptionRowHandler.cpp */,
@@ -4944,6 +4958,7 @@
2B30D6831315EA7E00044B68 /* MouseDevice.h in Headers */,
EE879B61132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h in Headers */,
EE879B63132DEE720078FDDC /* RageDisplay_Legacy.h in Headers */,
2B76698B132FF71500586512 /* NotesLoaderSMA.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6187,6 +6202,7 @@
EE879B60132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp in Sources */,
EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */,
EE879BC3132E06C50078FDDC /* glew.c in Sources */,
2B76698C132FF71500586512 /* NotesLoaderSMA.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};