From 66d46452abc69ea381322dc8ff91955eb2813be0 Mon Sep 17 00:00:00 2001 From: Dietrich Epp Date: Thu, 24 Mar 2022 23:00:31 -0400 Subject: [PATCH] Remove usage of Carbon from command-line tool The use of Carbon turns out to be less useful than originally thought, so it makes sense to remove it. --- convert/defs.h | 4 ---- syncfiles.xcodeproj/project.pbxproj | 16 +--------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/convert/defs.h b/convert/defs.h index 7a5a4a8..814d473 100644 --- a/convert/defs.h +++ b/convert/defs.h @@ -6,10 +6,6 @@ #include -#elif USE_CARBON - -/* We get definitions from pre-compiled headers. */ - #else /* Definitions in */ diff --git a/syncfiles.xcodeproj/project.pbxproj b/syncfiles.xcodeproj/project.pbxproj index 6fc5fad..75c4ccc 100644 --- a/syncfiles.xcodeproj/project.pbxproj +++ b/syncfiles.xcodeproj/project.pbxproj @@ -18,7 +18,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 3892E74027EBDBCB00C0FC23 /* syncfiles */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = syncfiles; sourceTree = BUILT_PRODUCTS_DIR; }; + 3892E74027EBDBCB00C0FC23 /* syncfiles */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = syncfiles; sourceTree = BUILT_PRODUCTS_DIR; }; 3892E74D27EBFC0B00C0FC23 /* convert.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = convert.c; sourceTree = ""; }; 3892E74E27EBFC0B00C0FC23 /* convert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = convert.h; sourceTree = ""; }; 3892E74F27EBFC0B00C0FC23 /* convert_1f.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = convert_1f.c; sourceTree = ""; }; @@ -156,14 +156,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - GCC_PREPROCESSOR_DEFINITIONS = USE_CARBON; INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = ( - "-framework", - Carbon, - ); PREBINDING = NO; PRODUCT_NAME = syncfiles; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)"; @@ -178,14 +171,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; - GCC_PREPROCESSOR_DEFINITIONS = USE_CARBON; INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = ( - "-framework", - Carbon, - ); PREBINDING = NO; PRODUCT_NAME = syncfiles; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";