Skip to content

Commit

Permalink
Added weak link support for the webp framework so it can be removed w…
Browse files Browse the repository at this point in the history 
…ithout breaking SDL_image
  • Loading branch information
@slouken
slouken committed Jun 3, 2013
1 parent 4760db8 commit b5d7d6c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 11 deletions.
10 changes: 10 additions & 0 deletions IMG_webp.c
View file
Expand Up @@ -103,6 +103,16 @@ void IMG_QuitWEBP()
int IMG_InitWEBP()
{
if ( lib.loaded == 0 ) {
#ifdef __MACOSX__
extern VP8StatusCode WebPGetFeaturesInternal(const uint8_t*, size_t, WebPBitstreamFeatures*, int) __attribute__((weak_import));
if ( WebPGetFeaturesInternal == NULL )
{
/* Missing weakly linked framework */
IMG_SetError("Missing webp.framework");
return -1;
}
#endif // __MACOSX__

lib.webp_get_features_internal = WebPGetFeaturesInternal;
lib.webp_decode_rgb_into = WebPDecodeRGBInto;
lib.webp_decode_rgba_into = WebPDecodeRGBAInto;
Expand Down
28 changes: 17 additions & 11 deletions Xcode/SDL_image.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,9 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
007288A70F0DA79800C302A9 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007288A60F0DA79800C302A9 /* ApplicationServices.framework */; };
007288A80F0DA79800C302A9 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007288A60F0DA79800C302A9 /* ApplicationServices.framework */; };
61F8544A145A19BC002CA294 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61F85449145A19BC002CA294 /* Foundation.framework */; };
AA579DF2161C07E6005F809B /* IMG_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = AA579DE2161C07E6005F809B /* IMG_bmp.c */; };
AA579DF3161C07E7005F809B /* IMG_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = AA579DE2161C07E6005F809B /* IMG_bmp.c */; };
AA579DF4161C07E7005F809B /* IMG_gif.c in Sources */ = {isa = PBXBuildFile; fileRef = AA579DE3161C07E6005F809B /* IMG_gif.c */; };
Expand Down Expand Up @@ -42,8 +40,9 @@
AA579E0F161C07E7005F809B /* IMG_xxx.c in Sources */ = {isa = PBXBuildFile; fileRef = AA579DF0161C07E6005F809B /* IMG_xxx.c */; };
AA579E10161C07E7005F809B /* IMG.c in Sources */ = {isa = PBXBuildFile; fileRef = AA579DF1161C07E6005F809B /* IMG.c */; };
AA579E11161C07E7005F809B /* IMG.c in Sources */ = {isa = PBXBuildFile; fileRef = AA579DF1161C07E6005F809B /* IMG.c */; };
AA9EE77614B27A62008773C0 /* webp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA9EE77514B27A62008773C0 /* webp.framework */; };
AA9EE77714B27A6C008773C0 /* webp.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AA9EE77514B27A62008773C0 /* webp.framework */; };
AADBAC88175C6AAB004F8ED2 /* webp.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AA9EE77514B27A62008773C0 /* webp.framework */; };
AADBAC89175C6B4C004F8ED2 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007288A60F0DA79800C302A9 /* ApplicationServices.framework */; };
AADBAC8A175C6B4F004F8ED2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61F85449145A19BC002CA294 /* Foundation.framework */; };
BE1FA71A07AF4C44004B6283 /* SDL_image.h in Headers */ = {isa = PBXBuildFile; fileRef = 1014BAEA010A4B677F000001 /* SDL_image.h */; settings = {ATTRIBUTES = (Public, ); }; };
BE1FA76307AF7335004B6283 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1FA76207AF7335004B6283 /* SDL2.framework */; };
/* End PBXBuildFile section */
Expand All @@ -54,7 +53,7 @@
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BE1FA71807AF4C44004B6283;
remoteInfo = "Framework";
remoteInfo = Framework;
};
/* End PBXContainerItemProxy section */

Expand All @@ -65,7 +64,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
AA9EE77714B27A6C008773C0 /* webp.framework in Copy Frameworks */,
AADBAC88175C6AAB004F8ED2 /* webp.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -108,10 +107,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
AADBAC89175C6B4C004F8ED2 /* ApplicationServices.framework in Frameworks */,
AADBAC8A175C6B4F004F8ED2 /* Foundation.framework in Frameworks */,
BE1FA76307AF7335004B6283 /* SDL2.framework in Frameworks */,
007288A70F0DA79800C302A9 /* ApplicationServices.framework in Frameworks */,
61F8544A145A19BC002CA294 /* Foundation.framework in Frameworks */,
AA9EE77614B27A62008773C0 /* webp.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -191,9 +189,10 @@
BE1FA76007AF72B1004B6283 /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
AA9EE77514B27A62008773C0 /* webp.framework */,
007288A60F0DA79800C302A9 /* ApplicationServices.framework */,
61F85449145A19BC002CA294 /* Foundation.framework */,
BE1FA76207AF7335004B6283 /* SDL2.framework */,
AA9EE77514B27A62008773C0 /* webp.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
Expand All @@ -202,7 +201,6 @@
isa = PBXGroup;
children = (
BE1FA76007AF72B1004B6283 /* Linked Frameworks */,
61F85449145A19BC002CA294 /* Foundation.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -513,6 +511,10 @@
INFOPLIST_FILE = "Info-Framework.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
OTHER_LDFLAGS = (
"-weak_framework",
webp,
);
WRAPPER_EXTENSION = framework;
};
name = Debug;
Expand Down Expand Up @@ -630,6 +632,10 @@
INFOPLIST_FILE = "Info-Framework.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
OTHER_LDFLAGS = (
"-weak_framework",
webp,
);
WRAPPER_EXTENSION = framework;
};
name = Release;
Expand Down

0 comments on commit b5d7d6c

Please sign in to comment.