external/libvorbis-1.3.5.patch
author Sam Lantinga <slouken@libsdl.org>
Sat, 21 Oct 2017 14:40:31 -0700
changeset 823 bcd59adacdcc
parent 745 b35987b637b2
permissions -rw-r--r--
Fixed linker order so -lmingw32 comes before -lSDL2main
slouken@745
     1
diff -ru libvorbis-1.3.5.orig/macosx/Vorbis.xcodeproj/project.pbxproj libvorbis-1.3.5/macosx/Vorbis.xcodeproj/project.pbxproj
slouken@745
     2
--- libvorbis-1.3.5.orig/macosx/Vorbis.xcodeproj/project.pbxproj	2013-11-11 20:01:46.000000000 -0800
slouken@745
     3
+++ libvorbis-1.3.5/macosx/Vorbis.xcodeproj/project.pbxproj	2017-10-12 16:18:35.000000000 -0700
slouken@745
     4
@@ -137,7 +137,6 @@
slouken@745
     5
 		F5D8F63703389C830112CE8F /* masking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = masking.h; sourceTree = "<group>"; };
slouken@745
     6
 		F5D8F63803389C830112CE8F /* mdct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = mdct.c; sourceTree = "<group>"; };
slouken@745
     7
 		F5D8F63903389C830112CE8F /* mdct.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mdct.h; sourceTree = "<group>"; };
slouken@745
     8
-		F5D8F63A03389C830112CE8F /* misc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
slouken@745
     9
 		F5D8F63B03389C830112CE8F /* misc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = "<group>"; };
slouken@745
    10
 		F5D8F63E03389C830112CE8F /* floor_all.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = floor_all.h; sourceTree = "<group>"; };
slouken@745
    11
 		F5D8F64103389C830112CE8F /* psych_11.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = psych_11.h; sourceTree = "<group>"; };
slouken@745
    12
@@ -289,7 +288,6 @@
slouken@745
    13
 				F5D8F63703389C830112CE8F /* masking.h */,
slouken@745
    14
 				F5D8F63803389C830112CE8F /* mdct.c */,
slouken@745
    15
 				F5D8F63903389C830112CE8F /* mdct.h */,
slouken@745
    16
-				F5D8F63A03389C830112CE8F /* misc.c */,
slouken@745
    17
 				F5D8F63B03389C830112CE8F /* misc.h */,
slouken@745
    18
 				F5D8F63C03389C830112CE8F /* modes */,
slouken@745
    19
 				F5D8F65103389C830112CE8F /* os.h */,
slouken@745
    20
@@ -524,11 +522,19 @@
slouken@745
    21
 /* Begin PBXProject section */
slouken@745
    22
 		0867D690FE84028FC02AAC07 /* Project object */ = {
slouken@745
    23
 			isa = PBXProject;
slouken@745
    24
+			attributes = {
slouken@745
    25
+			};
slouken@745
    26
 			buildConfigurationList = 730F23F3091827B200AB638C /* Build configuration list for PBXProject "Vorbis" */;
slouken@745
    27
+			compatibilityVersion = "Xcode 2.4";
slouken@745
    28
+			developmentRegion = English;
slouken@745
    29
 			hasScannedForEncodings = 0;
slouken@745
    30
+			knownRegions = (
slouken@745
    31
+				en,
slouken@745
    32
+			);
slouken@745
    33
 			mainGroup = 0867D691FE84028FC02AAC07 /* vorbis */;
slouken@745
    34
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
slouken@745
    35
 			projectDirPath = "";
slouken@745
    36
+			projectRoot = "";
slouken@745
    37
 			targets = (
slouken@745
    38
 				730F23A1091827B100AB638C /* Vorbis */,
slouken@745
    39
 				738835E30B18F870005C7A69 /* libvorbis (static) */,
slouken@745
    40
@@ -649,20 +655,30 @@
slouken@745
    41
 		730F23ED091827B100AB638C /* Debug */ = {
slouken@745
    42
 			isa = XCBuildConfiguration;
slouken@745
    43
 			buildSettings = {
slouken@745
    44
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
slouken@745
    45
 				COPY_PHASE_STRIP = NO;
slouken@745
    46
-				DYLIB_COMPATIBILITY_VERSION = 1;
slouken@745
    47
-				DYLIB_CURRENT_VERSION = 1;
slouken@745
    48
-				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
slouken@745
    49
+				DYLIB_COMPATIBILITY_VERSION = 5.0.0;
slouken@745
    50
+				DYLIB_CURRENT_VERSION = 5.8.0;
slouken@745
    51
+				FRAMEWORK_SEARCH_PATHS = (
slouken@745
    52
+					/Library/Frameworks,
slouken@745
    53
+					../../../Xcode/Frameworks,
slouken@745
    54
+				);
slouken@745
    55
 				FRAMEWORK_VERSION = A;
slouken@745
    56
 				GCC_DYNAMIC_NO_PIC = NO;
slouken@745
    57
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
slouken@745
    58
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
slouken@745
    59
-				HEADER_SEARCH_PATHS = ../lib;
slouken@745
    60
+				HEADER_SEARCH_PATHS = (
slouken@745
    61
+					../lib,
slouken@745
    62
+					../../../Xcode/Frameworks/Framework.Ogg/Headers,
slouken@745
    63
+				);
slouken@745
    64
 				INFOPLIST_FILE = Info.plist;
slouken@745
    65
 				INSTALL_PATH = /Library/Frameworks;
slouken@745
    66
+				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
slouken@745
    67
 				LIBRARY_SEARCH_PATHS = "";
slouken@745
    68
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
slouken@745
    69
 				OTHER_LDFLAGS = "";
slouken@745
    70
 				PRODUCT_NAME = Vorbis;
slouken@745
    71
+				SDKROOT = macosx;
slouken@745
    72
 				SECTORDER_FLAGS = "";
slouken@745
    73
 				WARNING_CFLAGS = (
slouken@745
    74
 					"-Wmost",
slouken@745
    75
@@ -677,18 +693,28 @@
slouken@745
    76
 		730F23EE091827B100AB638C /* Release */ = {
slouken@745
    77
 			isa = XCBuildConfiguration;
slouken@745
    78
 			buildSettings = {
slouken@745
    79
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
slouken@745
    80
 				COPY_PHASE_STRIP = YES;
slouken@745
    81
-				DYLIB_COMPATIBILITY_VERSION = 1;
slouken@745
    82
-				DYLIB_CURRENT_VERSION = 1;
slouken@745
    83
-				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
slouken@745
    84
+				DYLIB_COMPATIBILITY_VERSION = 5.0.0;
slouken@745
    85
+				DYLIB_CURRENT_VERSION = 5.8.0;
slouken@745
    86
+				FRAMEWORK_SEARCH_PATHS = (
slouken@745
    87
+					/Library/Frameworks,
slouken@745
    88
+					../../../Xcode/Frameworks,
slouken@745
    89
+				);
slouken@745
    90
 				FRAMEWORK_VERSION = A;
slouken@745
    91
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
slouken@745
    92
-				HEADER_SEARCH_PATHS = ../lib;
slouken@745
    93
+				HEADER_SEARCH_PATHS = (
slouken@745
    94
+					../lib,
slouken@745
    95
+					../../../Xcode/Frameworks/Framework.Ogg/Headers,
slouken@745
    96
+				);
slouken@745
    97
 				INFOPLIST_FILE = Info.plist;
slouken@745
    98
 				INSTALL_PATH = /Library/Frameworks;
slouken@745
    99
+				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
slouken@745
   100
 				LIBRARY_SEARCH_PATHS = "";
slouken@745
   101
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
slouken@745
   102
 				OTHER_LDFLAGS = "";
slouken@745
   103
 				PRODUCT_NAME = Vorbis;
slouken@745
   104
+				SDKROOT = macosx;
slouken@745
   105
 				SECTORDER_FLAGS = "";
slouken@745
   106
 				WARNING_CFLAGS = (
slouken@745
   107
 					"-Wmost",