Skip to content

Fix build from source #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2021
Merged

Fix build from source #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00a16f0
Replace -mmacosx-version-min with -target
cafarm Nov 15, 2021
fabcf38
Replace absolute paths with relative paths
cafarm Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 24 additions & 38 deletions SourceCodeSyntaxHighlight.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,20 +162,20 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
1F39AA702741F97600569E96 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83B47BB725A77AEE00DE0CF4 /* highlight-wrapper.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83B4645425A779FC00DE0CF4;
remoteInfo = "highlight-wrapper";
};
830DF9F127203756004429F8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 832580AF263812C800A8888F /* dos2unix.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83257FD82638126E00A8888F;
remoteInfo = dos2unix;
};
830DF9F327203756004429F8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83B47BB725A77AEE00DE0CF4 /* highlight-wrapper.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83B4645425A779FC00DE0CF4;
remoteInfo = "highlight-wrapper";
};
8319450E26394445002E5B86 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 832580AF263812C800A8888F /* dos2unix.xcodeproj */;
Expand Down Expand Up @@ -218,13 +218,6 @@
remoteGlobalIDString = 838F4659238D813500268B4A;
remoteInfo = SyntaxHighlightRenderXPC;
};
83B47BBA25A77AEE00DE0CF4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83B47BB725A77AEE00DE0CF4 /* highlight-wrapper.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83B4645425A779FC00DE0CF4;
remoteInfo = "highlight-wrapper";
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -641,7 +634,7 @@
83B4644325A76D9700DE0CF4 /* AboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
83B4646825A779FD00DE0CF4 /* highlight-wrapper.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "highlight-wrapper.xcodeproj"; sourceTree = "<group>"; };
83B47B9C25A77A5600DE0CF4 /* wrapper_highlight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrapper_highlight.h; sourceTree = "<group>"; };
83B47BB725A77AEE00DE0CF4 /* highlight-wrapper.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "highlight-wrapper.xcodeproj"; path = "/Users/sbaldiss/Develop/OSX/QLExt/highlight-wrapper/highlight-wrapper.xcodeproj"; sourceTree = "<absolute>"; };
83B47BB725A77AEE00DE0CF4 /* highlight-wrapper.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "highlight-wrapper.xcodeproj"; path = "highlight-wrapper/highlight-wrapper.xcodeproj"; sourceTree = "<group>"; };
83B47BC225A77C1000DE0CF4 /* SourceCodeSyntaxHighlight-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SourceCodeSyntaxHighlight-Bridging-Header.h"; sourceTree = "<group>"; };
83B47BC825A77C6F00DE0CF4 /* libwrapper_highlight.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libwrapper_highlight.dylib; path = highlight/libwrapper_highlight.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
83BA16E725EBC5AB0054A404 /* SliderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SliderView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -710,6 +703,13 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1F39AA6C2741F85500569E96 /* Products */ = {
isa = PBXGroup;
children = (
);
name = Products;
sourceTree = "<group>";
};
83194503263812E2002E5B86 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1073,9 +1073,8 @@
832580C1263812C800A8888F /* DEVEL.txt */,
832580C2263812C800A8888F /* unix2dos.c */,
);
name = dos2unix;
path = /Users/sbaldiss/Develop/OSX/QLExt/dos2unix;
sourceTree = "<absolute>";
path = dos2unix;
sourceTree = "<group>";
};
8359233C235599F6001506B6 = {
isa = PBXGroup;
Expand Down Expand Up @@ -1285,13 +1284,6 @@
path = "highlight-wrapper";
sourceTree = "<group>";
};
83B47BB825A77AEE00DE0CF4 /* Products */ = {
isa = PBXGroup;
children = (
);
name = Products;
sourceTree = "<group>";
};
83BA16E525EBC57D0054A404 /* Views */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1348,8 +1340,8 @@
);
dependencies = (
836B55CE272E92D9008297D5 /* PBXTargetDependency */,
1F39AA712741F97600569E96 /* PBXTargetDependency */,
8319450F26394445002E5B86 /* PBXTargetDependency */,
83B47BBB25A77AEE00DE0CF4 /* PBXTargetDependency */,
8359236923559A2B001506B6 /* PBXTargetDependency */,
8359238523563BDF001506B6 /* PBXTargetDependency */,
838F4664238D813500268B4A /* PBXTargetDependency */,
Expand Down Expand Up @@ -1408,7 +1400,6 @@
);
dependencies = (
830DF9F227203756004429F8 /* PBXTargetDependency */,
830DF9F427203756004429F8 /* PBXTargetDependency */,
);
name = syntax_highlight_cli;
packageProductDependencies = (
Expand Down Expand Up @@ -1501,7 +1492,7 @@
ProjectRef = 832580AF263812C800A8888F /* dos2unix.xcodeproj */;
},
{
ProductGroup = 83B47BB825A77AEE00DE0CF4 /* Products */;
ProductGroup = 1F39AA6C2741F85500569E96 /* Products */;
ProjectRef = 83B47BB725A77AEE00DE0CF4 /* highlight-wrapper.xcodeproj */;
},
{
Expand Down Expand Up @@ -1741,16 +1732,16 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
1F39AA712741F97600569E96 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "highlight-wrapper";
targetProxy = 1F39AA702741F97600569E96 /* PBXContainerItemProxy */;
};
830DF9F227203756004429F8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = dos2unix;
targetProxy = 830DF9F127203756004429F8 /* PBXContainerItemProxy */;
};
830DF9F427203756004429F8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "highlight-wrapper";
targetProxy = 830DF9F327203756004429F8 /* PBXContainerItemProxy */;
};
8319450F26394445002E5B86 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = dos2unix;
Expand Down Expand Up @@ -1781,11 +1772,6 @@
target = 838F4659238D813500268B4A /* Syntax Highlight XPC Render */;
targetProxy = 838F4663238D813500268B4A /* PBXContainerItemProxy */;
};
83B47BBB25A77AEE00DE0CF4 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "highlight-wrapper";
targetProxy = 83B47BBA25A77AEE00DE0CF4 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand Down
4 changes: 2 additions & 2 deletions dos2unix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ ifeq ($(ONLY_ACTIVE_ARCH),)
ONLY_ACTIVE_ARCH=NO
endif

CFLAGS_x86_64=-mmacosx-version-min=10.15
CFLAGS_x86_64=-target x86_64-apple-macos10.15
CFLAGS_arm64=-target arm64-apple-macos11

LDFLAGS_x86_64=
LDFLAGS_x86_64=-target x86_64-apple-macos10.15
LDFLAGS_arm64=-target arm64-apple-macos11

bold := $(shell tput bold 2> /dev/null)
Expand Down
4 changes: 2 additions & 2 deletions highlight-wrapper/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ CFLAGS=-Wall -std=c++11 -D_FILE_OFFSET_BITS=64 \
-I ${BUILD_DIR}
LDFLAGS=-L${BUILD_DIR}

CFLAGS_x86_64=-mmacosx-version-min=10.15
CFLAGS_x86_64=-target x86_64-apple-macos10.15
CFLAGS_arm64=-target arm64-apple-macos11

# ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/.*),)
# CFLAGS_x86_64+=-isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk
# endif

LDFLAGS_x86_64=-mmacosx-version-min=10.15
LDFLAGS_x86_64=-target x86_64-apple-macos10.15
LDFLAGS_arm64=-target arm64-apple-macos11

ifeq ($(CONFIGURATION),Debug)
Expand Down