The following short patch on the trunk allows cog to compile on case-sensitive machines.
Index: Frameworks/Vorbis/Files/include/vorbis/codec.h
===================================================================
--- Frameworks/Vorbis/Files/include/vorbis/codec.h (revision 651)
+++ Frameworks/Vorbis/Files/include/vorbis/codec.h (working copy)
@@ -23,7 +23,7 @@
{
#endif /* __cplusplus */
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
typedef struct vorbis_info{
int version;
Index: Frameworks/Vorbis/Files/lib/floor0.c
===================================================================
--- Frameworks/Vorbis/Files/lib/floor0.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/floor0.c (working copy)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Index: Frameworks/Vorbis/Files/lib/floor1.c
===================================================================
--- Frameworks/Vorbis/Files/lib/floor1.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/floor1.c (working copy)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Index: Frameworks/Vorbis/Files/lib/mapping0.c
===================================================================
--- Frameworks/Vorbis/Files/lib/mapping0.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/mapping0.c (working copy)
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "codebook.h"
Index: Frameworks/Vorbis/Files/lib/envelope.c
===================================================================
--- Frameworks/Vorbis/Files/lib/envelope.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/envelope.c (working copy)
@@ -19,7 +19,7 @@
#include <string.h>
#include <stdio.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
Index: Frameworks/Vorbis/Files/lib/codebook.c
===================================================================
--- Frameworks/Vorbis/Files/lib/codebook.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/codebook.c (working copy)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codebook.h"
#include "scales.h"
Index: Frameworks/Vorbis/Files/lib/os.h
===================================================================
--- Frameworks/Vorbis/Files/lib/os.h (revision 651)
+++ Frameworks/Vorbis/Files/lib/os.h (working copy)
@@ -22,7 +22,7 @@
#endif
#include <math.h>
-#include <ogg/os_types.h>
+#include <Ogg/os_types.h>
#include "misc.h"
Index: Frameworks/Vorbis/Files/lib/synthesis.c
===================================================================
--- Frameworks/Vorbis/Files/lib/synthesis.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/synthesis.c (working copy)
@@ -16,7 +16,7 @@
********************************************************************/
#include <stdio.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Index: Frameworks/Vorbis/Files/lib/bitrate.c
===================================================================
--- Frameworks/Vorbis/Files/lib/bitrate.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/bitrate.c (working copy)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "os.h"
Index: Frameworks/Vorbis/Files/lib/codebook.h
===================================================================
--- Frameworks/Vorbis/Files/lib/codebook.h (revision 651)
+++ Frameworks/Vorbis/Files/lib/codebook.h (working copy)
@@ -18,7 +18,7 @@
#ifndef _V_CODEBOOK_H_
#define _V_CODEBOOK_H_
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
/* This structure encapsulates huffman and VQ style encoding books; it
doesn't do anything specific to either.
Index: Frameworks/Vorbis/Files/lib/info.c
===================================================================
--- Frameworks/Vorbis/Files/lib/info.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/info.c (working copy)
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "codebook.h"
Index: Frameworks/Vorbis/Files/lib/res0.c
===================================================================
--- Frameworks/Vorbis/Files/lib/res0.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/res0.c (working copy)
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Index: Frameworks/Vorbis/Files/lib/sharedbook.c
===================================================================
--- Frameworks/Vorbis/Files/lib/sharedbook.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/sharedbook.c (working copy)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <math.h>
#include <string.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "os.h"
#include "misc.h"
#include "vorbis/codec.h"
Index: Frameworks/Vorbis/Files/lib/analysis.c
===================================================================
--- Frameworks/Vorbis/Files/lib/analysis.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/analysis.c (working copy)
@@ -18,7 +18,7 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Index: Frameworks/Vorbis/Files/lib/block.c
===================================================================
--- Frameworks/Vorbis/Files/lib/block.c (revision 651)
+++ Frameworks/Vorbis/Files/lib/block.c (working copy)
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ogg/ogg.h>
+#include <Ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
Index: Plugins/WavPack/WavPackDecoder.h
===================================================================
--- Plugins/WavPack/WavPackDecoder.h (revision 651)
+++ Plugins/WavPack/WavPackDecoder.h (working copy)
@@ -9,7 +9,7 @@
#import <Cocoa/Cocoa.h>
#import "Plugin.h"
-#import "Wavpack/wputils.h"
+#import "WavPack/wputils.h"
@interface WavPackDecoder : NSObject <CogDecoder>
{
Index: Plugins/MonkeysAudio/MonkeysAudioDecoder.mm
===================================================================
--- Plugins/MonkeysAudio/MonkeysAudioDecoder.mm (revision 651)
+++ Plugins/MonkeysAudio/MonkeysAudioDecoder.mm (working copy)
@@ -7,7 +7,7 @@
//
#import "MonkeysAudioDecoder.h"
-#import "MAC/ApeInfo.h"
+#import "MAC/APEInfo.h"
#import "MAC/CharacterHelper.h"
@implementation MonkeysAudioDecoder
Index: Cog.xcodeproj/project.pbxproj
===================================================================
--- Cog.xcodeproj/project.pbxproj (revision 651)
+++ Cog.xcodeproj/project.pbxproj (working copy)
@@ -14,7 +14,6 @@
171B57DE0C091F2B00F6AFAF /* m4a.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DA0C091F2B00F6AFAF /* m4a.icns */; };
171B57DF0C091F2B00F6AFAF /* mp3.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DB0C091F2B00F6AFAF /* mp3.icns */; };
171B57E00C091F2B00F6AFAF /* ogg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DC0C091F2B00F6AFAF /* ogg.icns */; };
- 171D09280CCA5FF0009FF3AB /* APL.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 171D09270CCA5FE1009FF3AB /* APL.bundle */; };
1755E1F90BA0D2B600CA3560 /* PlaylistLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */; };
1766C6930B911DF1004A7AE4 /* AudioScrobbler.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C68F0B911DF1004A7AE4 /* AudioScrobbler.m */; };
1766C6950B911DF1004A7AE4 /* AudioScrobblerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C6910B911DF1004A7AE4 /* AudioScrobblerClient.m */; };
@@ -132,20 +131,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 171D09260CCA5FE1009FF3AB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 99B989F40CC7E10400C256E9;
- remoteInfo = "APL Plugin";
- };
- 171D09410CCA6027009FF3AB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 99B989F30CC7E10400C256E9;
- remoteInfo = "APL Plugin";
- };
17BF2B260CDD77EB007E1295 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17BF2B1F0CDD77EB007E1295 /* Sparkle.xcodeproj */;
@@ -384,6 +369,13 @@
remoteGlobalIDString = 8D5B49AC048680CD000E48DA;
remoteInfo = General;
};
+ 562527B60D5311090016BD74 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 99B989F40CC7E10400C256E9;
+ remoteInfo = "APL Plugin";
+ };
8E8D40860CBB036600135C1B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8E8D40820CBB036600135C1B /* M3u.xcodeproj */;
@@ -421,7 +413,6 @@
dstPath = "";
dstSubfolderSpec = 13;
files = (
- 171D09280CCA5FF0009FF3AB /* APL.bundle in CopyFiles */,
17C8F7D80CBEF3EF008D969D /* Dumb.bundle in CopyFiles */,
17C8F3CF0CBED66C008D969D /* GME.bundle in CopyFiles */,
17F3BB890CBC565900864489 /* CueSheet.bundle in CopyFiles */,
@@ -466,7 +457,7 @@
171B57DA0C091F2B00F6AFAF /* m4a.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = m4a.icns; sourceTree = "<group>"; };
171B57DB0C091F2B00F6AFAF /* mp3.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mp3.icns; sourceTree = "<group>"; };
171B57DC0C091F2B00F6AFAF /* ogg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ogg.icns; sourceTree = "<group>"; };
- 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = APL.xcodeproj; path = Plugins/Apl/APL.xcodeproj; sourceTree = "<group>"; };
+ 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = APL.xcodeproj; path = Plugins/APL/APL.xcodeproj; sourceTree = "<group>"; };
1755E1F60BA0D2B600CA3560 /* PlaylistLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlaylistLoader.h; sourceTree = "<group>"; };
1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PlaylistLoader.m; sourceTree = "<group>"; };
1766C68E0B911DF1004A7AE4 /* AudioScrobbler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AudioScrobbler.h; sourceTree = "<group>"; };
@@ -692,14 +683,6 @@
name = "Other Frameworks";
sourceTree = "<group>";
};
- 171D09230CCA5FE1009FF3AB /* Products */ = {
- isa = PBXGroup;
- children = (
- 171D09270CCA5FE1009FF3AB /* APL.bundle */,
- );
- name = Products;
- sourceTree = "<group>";
- };
1766C68D0B911DF1004A7AE4 /* AudioScrobbler */ = {
isa = PBXGroup;
children = (
@@ -1068,6 +1051,14 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 562527B30D5311090016BD74 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 562527B70D5311090016BD74 /* APL.bundle */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
8E07AAEA0AAC90DC00A4B32F /* Preferences */ = {
isa = PBXGroup;
children = (
@@ -1225,7 +1216,6 @@
17F3BB8B0CBC566200864489 /* PBXTargetDependency */,
17C8F44C0CBEDD37008D969D /* PBXTargetDependency */,
17C8F7DA0CBEF3F9008D969D /* PBXTargetDependency */,
- 171D09420CCA6027009FF3AB /* PBXTargetDependency */,
17BF2B3A0CDD7827007E1295 /* PBXTargetDependency */,
);
name = Cog;
@@ -1256,7 +1246,7 @@
projectDirPath = "";
projectReferences = (
{
- ProductGroup = 171D09230CCA5FE1009FF3AB /* Products */;
+ ProductGroup = 562527B30D5311090016BD74 /* Products */;
ProjectRef = 171D09220CCA5FE1009FF3AB /* APL.xcodeproj */;
},
{
@@ -1344,13 +1334,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 171D09270CCA5FE1009FF3AB /* APL.bundle */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = APL.bundle;
- remoteRef = 171D09260CCA5FE1009FF3AB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
17BF2B270CDD77EB007E1295 /* Sparkle.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
@@ -1470,6 +1453,13 @@
remoteRef = 17F5622D0C3BD8FB0019975C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
+ 562527B70D5311090016BD74 /* APL.bundle */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.cfbundle;
+ path = APL.bundle;
+ remoteRef = 562527B60D5311090016BD74 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
8E8D40870CBB036600135C1B /* M3u.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
@@ -1600,11 +1590,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 171D09420CCA6027009FF3AB /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "APL Plugin";
- targetProxy = 171D09410CCA6027009FF3AB /* PBXContainerItemProxy */;
- };
17BF2B3A0CDD7827007E1295 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Sparkle;