From 7ceb0e76b6a2063e15d7b351e6f573fc41d7afe8 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 20 Sep 2021 14:01:19 -0400 Subject: [PATCH] Fix LZO issues in Xcode --- {Dependencies/minilzo-2.10 => LZO}/README.LZO | 0 {Dependencies/minilzo-2.10 => LZO}/lzoconf.h | 0 {Dependencies/minilzo-2.10 => LZO}/minilzo.c | 0 {Dependencies/minilzo-2.10 => LZO}/testmini | Bin SilicaViewer.xcodeproj/project.pbxproj | 59 ++++++++++-------- 5 files changed, 32 insertions(+), 27 deletions(-) rename {Dependencies/minilzo-2.10 => LZO}/README.LZO (100%) rename {Dependencies/minilzo-2.10 => LZO}/lzoconf.h (100%) rename {Dependencies/minilzo-2.10 => LZO}/minilzo.c (100%) rename {Dependencies/minilzo-2.10 => LZO}/testmini (100%) diff --git a/Dependencies/minilzo-2.10/README.LZO b/LZO/README.LZO similarity index 100% rename from Dependencies/minilzo-2.10/README.LZO rename to LZO/README.LZO diff --git a/Dependencies/minilzo-2.10/lzoconf.h b/LZO/lzoconf.h similarity index 100% rename from Dependencies/minilzo-2.10/lzoconf.h rename to LZO/lzoconf.h diff --git a/Dependencies/minilzo-2.10/minilzo.c b/LZO/minilzo.c similarity index 100% rename from Dependencies/minilzo-2.10/minilzo.c rename to LZO/minilzo.c diff --git a/Dependencies/minilzo-2.10/testmini b/LZO/testmini similarity index 100% rename from Dependencies/minilzo-2.10/testmini rename to LZO/testmini diff --git a/SilicaViewer.xcodeproj/project.pbxproj b/SilicaViewer.xcodeproj/project.pbxproj index afbe471..4efcf46 100644 --- a/SilicaViewer.xcodeproj/project.pbxproj +++ b/SilicaViewer.xcodeproj/project.pbxproj @@ -26,18 +26,16 @@ 036AFC11241800350075400A /* ThumbnailProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 036AFC10241800350075400A /* ThumbnailProvider.swift */; }; 036AFC16241800350075400A /* Thumbnail.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 036AFC0B241800350075400A /* Thumbnail.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 036AFC1B241800850075400A /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 036AFC1A241800850075400A /* ZIPFoundation */; }; -==== BASE ==== - 037B4042241821D200392452 /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 037B4041241821D200392452 /* InfoViewController.swift */; }; - 03CB382424191F620078B3E5 /* cbridge.c in Sources */ = {isa = PBXBuildFile; fileRef = 03CB382324191F620078B3E5 /* cbridge.c */; }; -==== BASE ==== + 03C39DDB26F8F3D8005555AE /* testmini.c in Sources */ = {isa = PBXBuildFile; fileRef = 03C39DD326F8F3D8005555AE /* testmini.c */; }; + 03C39DDC26F8F3D8005555AE /* lzodefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C39DD426F8F3D8005555AE /* lzodefs.h */; }; + 03C39DDD26F8F3D8005555AE /* minilzo.c in Sources */ = {isa = PBXBuildFile; fileRef = 03C39DD526F8F3D8005555AE /* minilzo.c */; }; + 03C39DDE26F8F3D8005555AE /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 03C39DD626F8F3D8005555AE /* Makefile */; }; + 03C39DDF26F8F3D8005555AE /* lzoconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C39DD726F8F3D8005555AE /* lzoconf.h */; }; + 03C39DE026F8F3D8005555AE /* minilzo.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C39DD826F8F3D8005555AE /* minilzo.h */; }; 03CB383B2419CA2D0078B3E5 /* libLZO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03CB382E2419C9DB0078B3E5 /* libLZO.a */; }; 03CB3840241A5AED0078B3E5 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03CB383F241A5AED0078B3E5 /* Shared.swift */; }; 03CB3841241A5AED0078B3E5 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03CB383F241A5AED0078B3E5 /* Shared.swift */; }; 03CB3842241A5AED0078B3E5 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03CB383F241A5AED0078B3E5 /* Shared.swift */; }; - 03CB3847241A5D600078B3E5 /* minilzo.h in Headers */ = {isa = PBXBuildFile; fileRef = 03CB3843241A5D600078B3E5 /* minilzo.h */; }; - 03CB3848241A5D600078B3E5 /* lzodefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 03CB3844241A5D600078B3E5 /* lzodefs.h */; }; - 03CB3849241A5D600078B3E5 /* minilzo.c in Sources */ = {isa = PBXBuildFile; fileRef = 03CB3845241A5D600078B3E5 /* minilzo.c */; }; - 03CB384A241A5D600078B3E5 /* lzoconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 03CB3846241A5D600078B3E5 /* lzoconf.h */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -103,17 +101,17 @@ 036AFC10241800350075400A /* ThumbnailProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailProvider.swift; sourceTree = ""; }; 036AFC12241800350075400A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 036AFC13241800350075400A /* Thumbnail.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Thumbnail.entitlements; sourceTree = ""; }; -==== BASE ==== - 037B4041241821D200392452 /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = ""; }; - 03CB382224191F610078B3E5 /* ProcreateViewer-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ProcreateViewer-Bridging-Header.h"; sourceTree = ""; }; - 03CB382324191F620078B3E5 /* cbridge.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cbridge.c; sourceTree = ""; }; -==== BASE ==== + 03C39DD226F8F3D7005555AE /* README.LZO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.LZO; sourceTree = ""; }; + 03C39DD326F8F3D8005555AE /* testmini.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testmini.c; sourceTree = ""; }; + 03C39DD426F8F3D8005555AE /* lzodefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzodefs.h; sourceTree = ""; }; + 03C39DD526F8F3D8005555AE /* minilzo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minilzo.c; sourceTree = ""; }; + 03C39DD626F8F3D8005555AE /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 03C39DD726F8F3D8005555AE /* lzoconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzoconf.h; sourceTree = ""; }; + 03C39DD826F8F3D8005555AE /* minilzo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = minilzo.h; sourceTree = ""; }; + 03C39DD926F8F3D8005555AE /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYING; sourceTree = ""; }; + 03C39DDA26F8F3D8005555AE /* testmini */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = testmini; sourceTree = ""; }; 03CB382E2419C9DB0078B3E5 /* libLZO.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLZO.a; sourceTree = BUILT_PRODUCTS_DIR; }; 03CB383F241A5AED0078B3E5 /* Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shared.swift; sourceTree = ""; }; - 03CB3843241A5D600078B3E5 /* minilzo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minilzo.h; path = "Dependencies/minilzo-2.10/minilzo.h"; sourceTree = SOURCE_ROOT; }; - 03CB3844241A5D600078B3E5 /* lzodefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzodefs.h; path = "Dependencies/minilzo-2.10/lzodefs.h"; sourceTree = SOURCE_ROOT; }; - 03CB3845241A5D600078B3E5 /* minilzo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minilzo.c; path = "Dependencies/minilzo-2.10/minilzo.c"; sourceTree = SOURCE_ROOT; }; - 03CB3846241A5D600078B3E5 /* lzoconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzoconf.h; path = "Dependencies/minilzo-2.10/lzoconf.h"; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -158,9 +156,9 @@ 030F6FE52415C5E300A43F01 = { isa = PBXGroup; children = ( + 03C39DE126F8F3E1005555AE /* LZO */, 035D19F726F0927200B332BE /* SilicaViewer */, 03CB383E241A5ACD0078B3E5 /* Shared */, - 03CB38322419C9F80078B3E5 /* LZO */, 030F700C2415C6B500A43F01 /* Quicklook */, 036AFC0F241800350075400A /* Thumbnail */, 030F70092415C6B500A43F01 /* Frameworks */, @@ -227,13 +225,18 @@ path = Thumbnail; sourceTree = ""; }; - 03CB38322419C9F80078B3E5 /* LZO */ = { + 03C39DE126F8F3E1005555AE /* LZO */ = { isa = PBXGroup; children = ( - 03CB3846241A5D600078B3E5 /* lzoconf.h */, - 03CB3844241A5D600078B3E5 /* lzodefs.h */, - 03CB3845241A5D600078B3E5 /* minilzo.c */, - 03CB3843241A5D600078B3E5 /* minilzo.h */, + 03C39DD926F8F3D8005555AE /* COPYING */, + 03C39DD726F8F3D8005555AE /* lzoconf.h */, + 03C39DD426F8F3D8005555AE /* lzodefs.h */, + 03C39DD626F8F3D8005555AE /* Makefile */, + 03C39DD526F8F3D8005555AE /* minilzo.c */, + 03C39DD826F8F3D8005555AE /* minilzo.h */, + 03C39DD226F8F3D7005555AE /* README.LZO */, + 03C39DDA26F8F3D8005555AE /* testmini */, + 03C39DD326F8F3D8005555AE /* testmini.c */, ); path = LZO; sourceTree = ""; @@ -253,9 +256,9 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 03CB3848241A5D600078B3E5 /* lzodefs.h in Headers */, - 03CB384A241A5D600078B3E5 /* lzoconf.h in Headers */, - 03CB3847241A5D600078B3E5 /* minilzo.h in Headers */, + 03C39DDF26F8F3D8005555AE /* lzoconf.h in Headers */, + 03C39DDC26F8F3D8005555AE /* lzodefs.h in Headers */, + 03C39DE026F8F3D8005555AE /* minilzo.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -495,7 +498,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 03CB3849241A5D600078B3E5 /* minilzo.c in Sources */, + 03C39DDE26F8F3D8005555AE /* Makefile in Sources */, + 03C39DDD26F8F3D8005555AE /* minilzo.c in Sources */, + 03C39DDB26F8F3D8005555AE /* testmini.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };