Skip to content

Commit 826f066

Browse files
danoli3danoli3
authored
tvOS Config fix. Clean (#8278)
1 parent a070789 commit 826f066

12 files changed

Lines changed: 1216 additions & 1195 deletions

File tree

‎libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ DEAD_CODE_STRIPPING = YES
101101
ENABLE_BITCODE = NO
102102
ENABLE_STRICT_OBJC_MSGSEND = YES
103103

104-
BUILT_PRODUCTS_DIR = $(SRCROOT)/bin/
105-
106104
SKIP_INSTALL = YES
107105

108106
CC = $(OF_PATH)/scripts/osx/cc.sh

‎libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ INSTALL_PATH = /Applications
119119
//WRAPPER_EXTENSION = app
120120

121121
SKIP_INSTALL = YES
122-
CONFIGURATION_BUILD_DIR = $(SRCROOT)/bin/
123122

124123
CC = $(OF_PATH)/scripts/osx/cc.sh
125124
CXX = $(OF_PATH)/scripts/osx/cxx.sh

‎libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,7 @@ INSTALL_PATH = /Applications
113113
SDKROOT = macosx
114114
WRAPPER_EXTENSION = app
115115

116-
BUILT_PRODUCTS_DIR = $(SRCROOT)/bin/
117-
118116
SKIP_INSTALL = YES
119117

120-
121118
CC = $(OF_PATH)/scripts/osx/cc.sh
122119
CXX = $(OF_PATH)/scripts/osx/cxx.sh

‎libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include"
2626
HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
2727

2828
//------- Libraries
29-
LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/tvos/libtvOS+OFLib_${CONFIGURATION}.a"
29+
LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/tvos/openFrameworkstvOS.a"
30+
LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/tvos/openFrameworkstvOSDebug.a"
3031

3132
MISC_FLAGS = "-ObjC"
3233

@@ -47,9 +48,6 @@ OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE
4748
OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AVFoundation -framework CoreAudio -framework CoreGraphics -framework CoreLocation -framework CoreMedia -framework CoreVideo -framework Foundation -framework GameController -framework GLKit -framework MapKit -framework OpenAL -framework OpenGLES -framework UIKit -framework Security -framework QuartzCore -framework Metal -framework MetalKit
4849

4950

50-
51-
52-
5351
DEAD_CODE_STRIPPING = YES
5452
GCC_AUTO_VECTORIZATION = YES
5553
ENABLE_BITCODE = NO

‎libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
691108B31FE53CCF00BDBA78 /* ofSoundBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofSoundBaseTypes.cpp; sourceTree = "<group>"; };
152152
691108B41FE53CCF00BDBA78 /* ofSoundBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundBaseTypes.h; sourceTree = "<group>"; };
153153
691108B61FE53CEB00BDBA78 /* ofVideoBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofVideoBaseTypes.h; sourceTree = "<group>"; };
154-
8446395C1BC343E000F24926 /* libtvOS+OFLib_Debug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libtvOS+OFLib_Debug.a"; sourceTree = BUILT_PRODUCTS_DIR; };
154+
8446395C1BC343E000F24926 /* openframeworksDebug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = openframeworksDebug.a; sourceTree = BUILT_PRODUCTS_DIR; };
155155
844639681BC3442400F24926 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CoreOF.xcconfig; sourceTree = "<group>"; };
156156
844639691BC3442400F24926 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
157157
8446396A1BC3442400F24926 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
@@ -440,15 +440,15 @@
440440
8446395D1BC343E000F24926 /* Products */,
441441
BFF80A4A2C50AFEB00784E74 /* Frameworks */,
442442
);
443-
sourceTree = "<group>";
444443
indentWidth = 4;
444+
sourceTree = "<group>";
445445
tabWidth = 4;
446446
usesTabs = 1;
447447
};
448448
8446395D1BC343E000F24926 /* Products */ = {
449449
isa = PBXGroup;
450450
children = (
451-
8446395C1BC343E000F24926 /* libtvOS+OFLib_Debug.a */,
451+
8446395C1BC343E000F24926 /* openframeworksDebug.a */,
452452
);
453453
name = Products;
454454
sourceTree = "<group>";
@@ -940,7 +940,6 @@
940940
isa = PBXNativeTarget;
941941
buildConfigurationList = 844639651BC343E000F24926 /* Build configuration list for PBXNativeTarget "tvOS+OFLib" */;
942942
buildPhases = (
943-
BFEF3F9F2C509EDD009B3CD8 /* ShellScript */,
944943
844639581BC343E000F24926 /* Sources */,
945944
844639591BC343E000F24926 /* Frameworks */,
946945
8446395A1BC343E000F24926 /* Copy Files */,
@@ -952,7 +951,7 @@
952951
);
953952
name = "tvOS+OFLib";
954953
productName = "tvOS+OFLib";
955-
productReference = 8446395C1BC343E000F24926 /* libtvOS+OFLib_Debug.a */;
954+
productReference = 8446395C1BC343E000F24926 /* openframeworksDebug.a */;
956955
productType = "com.apple.product-type.library.static";
957956
};
958957
/* End PBXNativeTarget section */
@@ -989,24 +988,6 @@
989988
/* End PBXProject section */
990989

991990
/* Begin PBXShellScriptBuildPhase section */
992-
BFEF3F9F2C509EDD009B3CD8 /* ShellScript */ = {
993-
isa = PBXShellScriptBuildPhase;
994-
alwaysOutOfDate = 1;
995-
buildActionMask = 2147483647;
996-
files = (
997-
);
998-
inputFileListPaths = (
999-
);
1000-
inputPaths = (
1001-
);
1002-
outputFileListPaths = (
1003-
);
1004-
outputPaths = (
1005-
);
1006-
runOnlyForDeploymentPostprocessing = 0;
1007-
shellPath = "/usr/bin/env bash";
1008-
shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for tvOS / macOS. Downloading libaries now via scripts/macos/download_libs.sh\"\n ${SRCROOT}/../../../../scripts/macos/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n";
1009-
};
1010991
BFF80A5B2C50B01B00784E74 /* ShellScript */ = {
1011992
isa = PBXShellScriptBuildPhase;
1012993
alwaysOutOfDate = 1;
@@ -1023,7 +1004,7 @@
10231004
);
10241005
runOnlyForDeploymentPostprocessing = 0;
10251006
shellPath = /bin/sh;
1026-
shellScript = "#!/bin/sh\nTARGET_DIR=\"$SRCROOT/../../lib/tvOS\"\nATTRIBUTE_CHECK=$(xattr -p com.apple.xcode.CreatedByBuildSystem \"$TARGET_DIR\" 2>/dev/null)\nif [ -z \"$ATTRIBUTE_CHECK\" ]; then\n xattr -w com.apple.xcode.CreatedByBuildSystem true \"$TARGET_DIR\"\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem set to true for $TARGET_DIR\"\nelse\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem already set for $TARGET_DIR\"\nfi\n";
1007+
shellScript = "#!/bin/sh\nTARGET_DIR=\"$SRCROOT/../../lib/tvOS\"\nATTRIBUTE_CHECK=$(xattr -p com.apple.xcode.CreatedByBuildSystem \"$TARGET_DIR\" 2>/dev/null)\nif [ -z \"$ATTRIBUTE_CHECK\" ]; then\n xattr -w com.apple.xcode.CreatedByBuildSystem true \"$TARGET_DIR\"\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem set to true for $TARGET_DIR\"\nelse\n echo \"Attribute com.apple.xcode.CreatedByBuildSystem already set for $TARGET_DIR\"\nfi\n\n\nTARGET_DIR=\"${SRCROOT}/../../lib/tvos/\"\nTARGET_CONFIG_DIR=\"${SRCROOT}/../../lib/tvos/build/output\"\n\nif [ \"${CONFIGURATION}\" == \"Release\" ]; then\n STATIC_NAME=\"openFrameworkstvOS\"\nelse\n STATIC_NAME=\"openFrameworkstvOS${CONFIGURATION}\"\nfi\n\nSOURCE_FILE=\"${TARGET_CONFIG_DIR}/${STATIC_NAME}.a\"\nDEST_FILE=\"${TARGET_DIR}/${STATIC_NAME}.a\"\n\necho \"Configuration: ${CONFIGURATION}\"\necho \"Source file: ${SOURCE_FILE}\"\necho \"Destination: ${DEST_FILE}\"\n\nmkdir -p \"${TARGET_DIR}\"\n\nif [ ! -w \"${TARGET_DIR}\" ]; then\n echo \"ERROR: Target directory ${TARGET_DIR} is not writable.\"\n ls -ld \"${TARGET_DIR}\"\n exit 1\nfi\n\nif [ ! -f \"${SOURCE_FILE}\" ]; then\n echo \"ERROR: Static library ${SOURCE_FILE} does not exist.\"\n exit 1\nfi\n\necho \"Copying ${SOURCE_FILE} to ${DEST_FILE}...\"\ncp -v \"${SOURCE_FILE}\" \"${DEST_FILE}\"\n\nif [ $? -ne 0 ]; then\n echo \"ERROR: Failed to copy ${SOURCE_FILE} to ${DEST_FILE}.\"\n exit 1\nfi\n\necho \"openFramworks build successful.\"\n";
10271008
};
10281009
/* End PBXShellScriptBuildPhase section */
10291010

@@ -1162,8 +1143,6 @@
11621143
CLANG_WARN_SUSPICIOUS_MOVE = YES;
11631144
CLANG_WARN_UNREACHABLE_CODE = YES;
11641145
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1165-
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvOS";
1166-
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/debug/";
11671146
COPY_PHASE_STRIP = NO;
11681147
DEBUG_INFORMATION_FORMAT = dwarf;
11691148
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1183,7 +1162,6 @@
11831162
GCC_WARN_UNUSED_FUNCTION = YES;
11841163
GCC_WARN_UNUSED_VARIABLE = YES;
11851164
MTL_ENABLE_DEBUG_INFO = YES;
1186-
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/debug";
11871165
ONLY_ACTIVE_ARCH = YES;
11881166
SDKROOT = appletvos;
11891167
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
@@ -1219,8 +1197,6 @@
12191197
CLANG_WARN_SUSPICIOUS_MOVE = YES;
12201198
CLANG_WARN_UNREACHABLE_CODE = YES;
12211199
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1222-
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvOS";
1223-
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/release/";
12241200
COPY_PHASE_STRIP = YES;
12251201
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
12261202
ENABLE_NS_ASSERTIONS = NO;
@@ -1234,7 +1210,6 @@
12341210
GCC_WARN_UNUSED_FUNCTION = YES;
12351211
GCC_WARN_UNUSED_VARIABLE = YES;
12361212
MTL_ENABLE_DEBUG_INFO = NO;
1237-
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/release";
12381213
SDKROOT = appletvos;
12391214
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
12401215
TVOS_DEPLOYMENT_TARGET = 17.2;
@@ -1245,16 +1220,20 @@
12451220
844639661BC343E000F24926 /* Debug */ = {
12461221
isa = XCBuildConfiguration;
12471222
buildSettings = {
1248-
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/debug/";
1223+
BUILD_DIR = "~/Library/Developer/Xcode/DerivedData";
1224+
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvos/build/output/";
1225+
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/temp/Debug/";
1226+
EXECUTABLE_PREFIX = "";
12491227
FRAMEWORK_SEARCH_PATHS = (
12501228
"$(inherited)",
1229+
"$(SRCROOT)/../../lib/tvos/build/output/",
12511230
"$(PROJECT_DIR)",
12521231
);
12531232
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
1254-
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/debug";
1233+
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/obj/Debug";
12551234
ONLY_ACTIVE_ARCH = YES;
12561235
OTHER_LDFLAGS = "-ObjC";
1257-
PRODUCT_NAME = "$(TARGET_NAME)_Debug";
1236+
PRODUCT_NAME = "openframeworkstvOSDebug";
12581237
SKIP_INSTALL = YES;
12591238
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
12601239
USE_HEADERMAP = NO;
@@ -1264,15 +1243,19 @@
12641243
844639671BC343E000F24926 /* Release */ = {
12651244
isa = XCBuildConfiguration;
12661245
buildSettings = {
1267-
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/release/";
1246+
BUILD_DIR = "~/Library/Developer/Xcode/DerivedData";
1247+
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvos/build/output/";
1248+
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/temp/Release/";
1249+
EXECUTABLE_PREFIX = "";
12681250
FRAMEWORK_SEARCH_PATHS = (
12691251
"$(inherited)",
1252+
"$(SRCROOT)/../../lib/tvos/build/output/",
12701253
"$(PROJECT_DIR)",
12711254
);
12721255
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
1273-
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/release";
1256+
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/obj/Release/";
12741257
OTHER_LDFLAGS = "-ObjC";
1275-
PRODUCT_NAME = "$(TARGET_NAME)_Release";
1258+
PRODUCT_NAME = "openframeworkstvOS";
12761259
SKIP_INSTALL = YES;
12771260
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
12781261
USE_HEADERMAP = NO;

0 commit comments

Comments
 (0)