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