Skip to content
This repository was archived by the owner on Mar 21, 2021. It is now read-only.

Commit a2f183f

Browse files
sloukenslouken
committed
Moved the FreeType framework out of the SDL_ttf framework so it can be correctly signed for the Apple App Store
1 parent 0fe7b8f commit a2f183f

File tree

134 files changed

+35075
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+35075
-72
lines changed

‎Xcode/SDL_ttf.xcodeproj/project.pbxproj

Lines changed: 48 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
isa = PBXCopyFilesBuildPhase;
3131
buildActionMask = 2147483647;
3232
dstPath = "";
33-
dstSubfolderSpec = 10;
33+
dstSubfolderSpec = 16;
3434
files = (
3535
AA9EE79A14B2C593008773C0 /* FreeType.framework in Copy Frameworks */,
3636
);
@@ -41,12 +41,12 @@
4141

4242
/* Begin PBXFileReference section */
4343
1014BAEA010A4B677F000001 /* SDL_ttf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_ttf.h; path = ../SDL_ttf.h; sourceTree = SOURCE_ROOT; };
44-
AA9EE79814B2C589008773C0 /* FreeType.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FreeType.framework; path = Frameworks/FreeType.framework; sourceTree = "<group>"; };
44+
AA9EE79814B2C589008773C0 /* FreeType.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FreeType.framework; sourceTree = "<group>"; };
4545
BE48FD6607AFA17000BB41DA /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
4646
BE48FD6707AFA17000BB41DA /* SDL2_ttf.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2_ttf.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4747
BE48FD6E07AFA17000BB41DA /* libSDL2_ttf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2_ttf.a; sourceTree = BUILT_PRODUCTS_DIR; };
4848
BE48FD7207AFA17000BB41DA /* Create DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Create DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
49-
BE48FD8307AFA29000BB41DA /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
49+
BE48FD8307AFA29000BB41DA /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = "<group>"; };
5050
F567D67A01CD962A01F3E8B9 /* SDL_ttf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SDL_ttf.c; path = ../SDL_ttf.c; sourceTree = SOURCE_ROOT; };
5151
F59C710300D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
5252
F59C710400D5CB5801000001 /* Welcome.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Welcome.txt; sourceTree = "<group>"; };
@@ -120,6 +120,29 @@
120120
name = "Library Source";
121121
sourceTree = "<group>";
122122
};
123+
A75FDAE023E3493000529352 /* macOS */ = {
124+
isa = PBXGroup;
125+
children = (
126+
AA9EE79814B2C589008773C0 /* FreeType.framework */,
127+
BE48FD8307AFA29000BB41DA /* SDL2.framework */,
128+
);
129+
path = macOS;
130+
sourceTree = "<group>";
131+
};
132+
A75FDAE123E3496200529352 /* iOS */ = {
133+
isa = PBXGroup;
134+
children = (
135+
);
136+
name = iOS;
137+
sourceTree = "<group>";
138+
};
139+
A75FDAE223E3496700529352 /* tvOS */ = {
140+
isa = PBXGroup;
141+
children = (
142+
);
143+
name = tvOS;
144+
sourceTree = "<group>";
145+
};
123146
BE48FD8107AFA26B00BB41DA /* Frameworks */ = {
124147
isa = PBXGroup;
125148
children = (
@@ -131,8 +154,9 @@
131154
BE48FD8207AFA27300BB41DA /* Linked Frameworks */ = {
132155
isa = PBXGroup;
133156
children = (
134-
AA9EE79814B2C589008773C0 /* FreeType.framework */,
135-
BE48FD8307AFA29000BB41DA /* SDL2.framework */,
157+
A75FDAE223E3496700529352 /* tvOS */,
158+
A75FDAE123E3496200529352 /* iOS */,
159+
A75FDAE023E3493000529352 /* macOS */,
136160
);
137161
name = "Linked Frameworks";
138162
sourceTree = "<group>";
@@ -186,7 +210,6 @@
186210
BE48FD6307AFA17000BB41DA /* Frameworks */,
187211
BE48FD6407AFA17000BB41DA /* Rez */,
188212
AA9EE79714B2C55E008773C0 /* Copy Frameworks */,
189-
AA9EE79B14B2C59B008773C0 /* Create Frameworks symlink */,
190213
AA9EE79C14B2C5D0008773C0 /* Convert SDL includes to SDL Framework includes */,
191214
);
192215
buildRules = (
@@ -292,20 +315,6 @@
292315
/* End PBXRezBuildPhase section */
293316

294317
/* Begin PBXShellScriptBuildPhase section */
295-
AA9EE79B14B2C59B008773C0 /* Create Frameworks symlink */ = {
296-
isa = PBXShellScriptBuildPhase;
297-
buildActionMask = 2147483647;
298-
files = (
299-
);
300-
inputPaths = (
301-
);
302-
name = "Create Frameworks symlink";
303-
outputPaths = (
304-
);
305-
runOnlyForDeploymentPostprocessing = 0;
306-
shellPath = /bin/sh;
307-
shellScript = "cd $SYMROOT/$CONFIGURATION/$FULL_PRODUCT_NAME\nif ! [ -L Frameworks ]; then\n rm -f Frameworks\n ln -s Versions/Current/Frameworks Frameworks\nfi";
308-
};
309318
AA9EE79C14B2C5D0008773C0 /* Convert SDL includes to SDL Framework includes */ = {
310319
isa = PBXShellScriptBuildPhase;
311320
buildActionMask = 2147483647;
@@ -318,7 +327,7 @@
318327
);
319328
runOnlyForDeploymentPostprocessing = 0;
320329
shellPath = /bin/sh;
321-
shellScript = "cd $SYMROOT/$CONFIGURATION/$PUBLIC_HEADERS_FOLDER_PATH\nHEADER=SDL_ttf.h\nsed 's,#include \"\\(.*\\)\",#include <SDL2/\\1>,' <$HEADER >$HEADER.new\nmv $HEADER.new $HEADER";
330+
shellScript = "cd $SYMROOT/$CONFIGURATION/$PUBLIC_HEADERS_FOLDER_PATH\nHEADER=SDL_ttf.h\nsed 's,#include \"\\(.*\\)\",#include <SDL2/\\1>,' <$HEADER >$HEADER.new\nmv $HEADER.new $HEADER\n";
322331
};
323332
BE48FD7107AFA17000BB41DA /* ShellScript */ = {
324333
isa = PBXShellScriptBuildPhase;
@@ -327,7 +336,7 @@
327336
);
328337
runOnlyForDeploymentPostprocessing = 0;
329338
shellPath = /bin/sh;
330-
shellScript = "PRODUCT_NAME=SDL2_ttf\n\n# Sign framework\nif [ \"$SDL_CODESIGN_IDENTITY\" != \"\" ]; then\n codesign --force --deep --sign \"$SDL_CODESIGN_IDENTITY\" $TARGET_BUILD_DIR/$PRODUCT_NAME.framework/Versions/A || exit $?\nfi\n\n# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\ncp -a $TARGET_BUILD_DIR/$PRODUCT_NAME.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname $PRODUCT_NAME -srcfolder build/dmg-tmp build/$PRODUCT_NAME.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
339+
shellScript = "PRODUCT_NAME=SDL2_ttf\n\n# Sign framework\nif [ \"$SDL_CODESIGN_IDENTITY\" != \"\" ]; then\n codesign --force --sign \"$SDL_CODESIGN_IDENTITY\" $TARGET_BUILD_DIR/$PRODUCT_NAME.framework/Versions/A || exit $?\n codesign --force --sign \"$SDL_CODESIGN_IDENTITY\" $TARGET_BUILD_DIR/FreeType.framework/Versions/A || exit $?\nfi\n\n# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\ncp -a $TARGET_BUILD_DIR/*.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname $PRODUCT_NAME -srcfolder build/dmg-tmp build/$PRODUCT_NAME.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
331340
};
332341
/* End PBXShellScriptBuildPhase section */
333342

@@ -362,60 +371,38 @@
362371
00B7E1EA097E26C600826121 /* Debug */ = {
363372
isa = XCBuildConfiguration;
364373
buildSettings = {
365-
COMBINE_HIDPI_IMAGES = YES;
366374
DYLIB_COMPATIBILITY_VERSION = 15.0.0;
367375
DYLIB_CURRENT_VERSION = 15.1.0;
368376
FRAMEWORK_VERSION = A;
369377
INFOPLIST_FILE = "Info-Framework.plist";
370378
INSTALL_PATH = "@rpath";
371-
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
372-
MACOSX_DEPLOYMENT_TARGET = 10.6;
373-
OTHER_CFLAGS = "";
374379
WRAPPER_EXTENSION = framework;
375380
};
376381
name = Debug;
377382
};
378383
00B7E1EB097E26C600826121 /* Release */ = {
379384
isa = XCBuildConfiguration;
380385
buildSettings = {
381-
COMBINE_HIDPI_IMAGES = YES;
382386
DYLIB_COMPATIBILITY_VERSION = 15.0.0;
383387
DYLIB_CURRENT_VERSION = 15.1.0;
384388
FRAMEWORK_VERSION = A;
385389
INFOPLIST_FILE = "Info-Framework.plist";
386390
INSTALL_PATH = "@rpath";
387-
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
388-
MACOSX_DEPLOYMENT_TARGET = 10.6;
389-
OTHER_CFLAGS = "";
390391
WRAPPER_EXTENSION = framework;
391392
};
392393
name = Release;
393394
};
394395
00B7E1EE097E26C600826121 /* Debug */ = {
395396
isa = XCBuildConfiguration;
396397
buildSettings = {
397-
COMBINE_HIDPI_IMAGES = YES;
398-
DYLIB_COMPATIBILITY_VERSION = 1;
399-
DYLIB_CURRENT_VERSION = 1;
400398
LIBRARY_STYLE = STATIC;
401-
OTHER_LIBTOOL_FLAGS = "";
402-
OTHER_REZFLAGS = "";
403-
REZ_EXECUTABLE = YES;
404-
SKIP_INSTALL = YES;
405399
};
406400
name = Debug;
407401
};
408402
00B7E1EF097E26C600826121 /* Release */ = {
409403
isa = XCBuildConfiguration;
410404
buildSettings = {
411-
COMBINE_HIDPI_IMAGES = YES;
412-
DYLIB_COMPATIBILITY_VERSION = 1;
413-
DYLIB_CURRENT_VERSION = 1;
414405
LIBRARY_STYLE = STATIC;
415-
OTHER_LIBTOOL_FLAGS = "";
416-
OTHER_REZFLAGS = "";
417-
REZ_EXECUTABLE = YES;
418-
SKIP_INSTALL = YES;
419406
};
420407
name = Release;
421408
};
@@ -461,50 +448,39 @@
461448
00B7E1F6097E26C600826121 /* Debug */ = {
462449
isa = XCBuildConfiguration;
463450
buildSettings = {
464-
FRAMEWORK_SEARCH_PATHS = (
465-
"$(FRAMEWORK_SEARCH_PATHS_QUOTED)",
466-
"$(HOME)/Library/Frameworks",
467-
/Library/Frameworks,
468-
);
469-
FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\"";
451+
COPY_PHASE_STRIP = NO;
452+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "\"$(SRCROOT)/macOS\"";
470453
GCC_OPTIMIZATION_LEVEL = 0;
471454
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
472-
HEADER_SEARCH_PATHS = (
473-
"$(HEADER_SEARCH_PATHS_QUOTED)",
474-
"$(HOME)/Library/Frameworks/SDL2.framework/Headers",
475-
/Library/Frameworks/SDL2.framework/Headers,
455+
"HEADER_SEARCH_PATHS[sdk=macosx*]" = (
456+
"\"$(SRCROOT)/macOS/SDL2.framework/Headers\"",
457+
"\"$(SRCROOT)/macOS/FreeType.framework/Headers\"",
476458
);
477-
HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks/FreeType.framework/Headers\"";
478-
MACOSX_DEPLOYMENT_TARGET = 10.5;
459+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
460+
MACOSX_DEPLOYMENT_TARGET = 10.6;
479461
ONLY_ACTIVE_ARCH = YES;
462+
PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.SDL2-ttf";
480463
PRODUCT_NAME = SDL2_ttf;
481-
SDKROOT = macosx;
464+
TVOS_DEPLOYMENT_TARGET = 9.0;
482465
};
483466
name = Debug;
484467
};
485468
00B7E1F7097E26C600826121 /* Release */ = {
486469
isa = XCBuildConfiguration;
487470
buildSettings = {
488471
DEPLOYMENT_POSTPROCESSING = YES;
489-
FRAMEWORK_SEARCH_PATHS = (
490-
"$(FRAMEWORK_SEARCH_PATHS_QUOTED)",
491-
"$(HOME)/Library/Frameworks",
492-
/Library/Frameworks,
493-
);
494-
FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\"";
472+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "\"$(SRCROOT)/macOS\"";
495473
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
496474
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
497-
HEADER_SEARCH_PATHS = (
498-
"$(HEADER_SEARCH_PATHS_QUOTED)",
499-
"$(HOME)/Library/Frameworks/SDL2.framework/Headers",
500-
/Library/Frameworks/SDL2.framework/Headers,
475+
"HEADER_SEARCH_PATHS[sdk=macosx*]" = (
476+
"\"$(SRCROOT)/macOS/SDL2.framework/Headers\"",
477+
"\"$(SRCROOT)/macOS/FreeType.framework/Headers\"",
501478
);
502-
HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks/FreeType.framework/Headers\"";
503-
MACOSX_DEPLOYMENT_TARGET = 10.5;
479+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
480+
MACOSX_DEPLOYMENT_TARGET = 10.6;
481+
PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.SDL2-ttf";
504482
PRODUCT_NAME = SDL2_ttf;
505-
SDKROOT = macosx;
506-
SEPARATE_STRIP = YES;
507-
STRIP_STYLE = "non-global";
483+
TVOS_DEPLOYMENT_TARGET = 9.0;
508484
};
509485
name = Release;
510486
};

‎Xcode/Frameworks/FreeType.framework/FreeType renamed to ‎Xcode/macOS/FreeType.framework/FreeType

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Headers renamed to ‎Xcode/macOS/FreeType.framework/Headers

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Resources renamed to ‎Xcode/macOS/FreeType.framework/Resources

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Versions/A/FreeType renamed to ‎Xcode/macOS/FreeType.framework/Versions/A/FreeType

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Versions/A/Headers/freetype/config/ftconfig.h renamed to ‎Xcode/macOS/FreeType.framework/Versions/A/Headers/freetype/config/ftconfig.h

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Versions/A/Headers/freetype/config/ftheader.h renamed to ‎Xcode/macOS/FreeType.framework/Versions/A/Headers/freetype/config/ftheader.h

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Versions/A/Headers/freetype/config/ftmodule.h renamed to ‎Xcode/macOS/FreeType.framework/Versions/A/Headers/freetype/config/ftmodule.h

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Versions/A/Headers/freetype/config/ftoption.h renamed to ‎Xcode/macOS/FreeType.framework/Versions/A/Headers/freetype/config/ftoption.h

File renamed without changes.

‎Xcode/Frameworks/FreeType.framework/Versions/A/Headers/freetype/config/ftstdlib.h renamed to ‎Xcode/macOS/FreeType.framework/Versions/A/Headers/freetype/config/ftstdlib.h

File renamed without changes.

0 commit comments

Comments
 (0)