Skip to content

Commit

Permalink
tvOS Config fix. Clean (#8278)
Browse files Browse the repository at this point in the history
  • Loading branch information
@danoli3
danoli3 authored Feb 23, 2025
1 parent a070789 commit 826f066
Show file tree
Hide file tree
Showing 12 changed files with 1,216 additions and 1,195 deletions.
2 changes: 0 additions & 2 deletions libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ DEAD_CODE_STRIPPING = YES
ENABLE_BITCODE = NO
ENABLE_STRICT_OBJC_MSGSEND = YES

BUILT_PRODUCTS_DIR = $(SRCROOT)/bin/

SKIP_INSTALL = YES

CC = $(OF_PATH)/scripts/osx/cc.sh
Expand Down
1 change: 0 additions & 1 deletion libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ INSTALL_PATH = /Applications
//WRAPPER_EXTENSION = app

SKIP_INSTALL = YES
CONFIGURATION_BUILD_DIR = $(SRCROOT)/bin/

CC = $(OF_PATH)/scripts/osx/cc.sh
CXX = $(OF_PATH)/scripts/osx/cxx.sh
3 changes: 0 additions & 3 deletions libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,7 @@ INSTALL_PATH = /Applications
SDKROOT = macosx
WRAPPER_EXTENSION = app

BUILT_PRODUCTS_DIR = $(SRCROOT)/bin/

SKIP_INSTALL = YES


CC = $(OF_PATH)/scripts/osx/cc.sh
CXX = $(OF_PATH)/scripts/osx/cxx.sh
6 changes: 2 additions & 4 deletions libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include"
HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"

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

MISC_FLAGS = "-ObjC"

Expand All @@ -47,9 +48,6 @@ OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE
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





DEAD_CODE_STRIPPING = YES
GCC_AUTO_VECTORIZATION = YES
ENABLE_BITCODE = NO
Expand Down
55 changes: 19 additions & 36 deletions libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
691108B31FE53CCF00BDBA78 /* ofSoundBaseTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofSoundBaseTypes.cpp; sourceTree = "<group>"; };
691108B41FE53CCF00BDBA78 /* ofSoundBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofSoundBaseTypes.h; sourceTree = "<group>"; };
691108B61FE53CEB00BDBA78 /* ofVideoBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofVideoBaseTypes.h; sourceTree = "<group>"; };
8446395C1BC343E000F24926 /* libtvOS+OFLib_Debug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libtvOS+OFLib_Debug.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8446395C1BC343E000F24926 /* openframeworksDebug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = openframeworksDebug.a; sourceTree = BUILT_PRODUCTS_DIR; };
844639681BC3442400F24926 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CoreOF.xcconfig; sourceTree = "<group>"; };
844639691BC3442400F24926 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
8446396A1BC3442400F24926 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
Expand Down Expand Up @@ -440,15 +440,15 @@
8446395D1BC343E000F24926 /* Products */,
BFF80A4A2C50AFEB00784E74 /* Frameworks */,
);
sourceTree = "<group>";
indentWidth = 4;
sourceTree = "<group>";
tabWidth = 4;
usesTabs = 1;
};
8446395D1BC343E000F24926 /* Products */ = {
isa = PBXGroup;
children = (
8446395C1BC343E000F24926 /* libtvOS+OFLib_Debug.a */,
8446395C1BC343E000F24926 /* openframeworksDebug.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -940,7 +940,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 844639651BC343E000F24926 /* Build configuration list for PBXNativeTarget "tvOS+OFLib" */;
buildPhases = (
BFEF3F9F2C509EDD009B3CD8 /* ShellScript */,
844639581BC343E000F24926 /* Sources */,
844639591BC343E000F24926 /* Frameworks */,
8446395A1BC343E000F24926 /* Copy Files */,
Expand All @@ -952,7 +951,7 @@
);
name = "tvOS+OFLib";
productName = "tvOS+OFLib";
productReference = 8446395C1BC343E000F24926 /* libtvOS+OFLib_Debug.a */;
productReference = 8446395C1BC343E000F24926 /* openframeworksDebug.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -989,24 +988,6 @@
/* End PBXProject section */

/* Begin PBXShellScriptBuildPhase section */
BFEF3F9F2C509EDD009B3CD8 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/usr/bin/env bash";
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";
};
BFF80A5B2C50B01B00784E74 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand All @@ -1023,7 +1004,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
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";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -1162,8 +1143,6 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvOS";
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/debug/";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -1183,7 +1162,6 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = YES;
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/debug";
ONLY_ACTIVE_ARCH = YES;
SDKROOT = appletvos;
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
Expand Down Expand Up @@ -1219,8 +1197,6 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvOS";
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/release/";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -1234,7 +1210,6 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = NO;
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/release";
SDKROOT = appletvos;
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
TVOS_DEPLOYMENT_TARGET = 17.2;
Expand All @@ -1245,16 +1220,20 @@
844639661BC343E000F24926 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/debug/";
BUILD_DIR = "~/Library/Developer/Xcode/DerivedData";
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvos/build/output/";
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/temp/Debug/";
EXECUTABLE_PREFIX = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../lib/tvos/build/output/",
"$(PROJECT_DIR)",
);
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/debug";
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/obj/Debug";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)_Debug";
PRODUCT_NAME = "openframeworkstvOSDebug";
SKIP_INSTALL = YES;
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
USE_HEADERMAP = NO;
Expand All @@ -1264,15 +1243,19 @@
844639671BC343E000F24926 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/release/";
BUILD_DIR = "~/Library/Developer/Xcode/DerivedData";
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/tvos/build/output/";
CONFIGURATION_TEMP_DIR = "$(SRCROOT)/../../lib/tvos/build/temp/Release/";
EXECUTABLE_PREFIX = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../lib/tvos/build/output/",
"$(PROJECT_DIR)",
);
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/release";
OBJROOT = "$(SRCROOT)/../../lib/tvos/build/obj/Release/";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)_Release";
PRODUCT_NAME = "openframeworkstvOS";
SKIP_INSTALL = YES;
SYMROOT = "$(SRCROOT)/../../lib/tvos/";
USE_HEADERMAP = NO;
Expand Down
Loading

0 comments on commit 826f066

Please sign in to comment.