Skip to content

Commit

Permalink
Change suffix OSX to macOS.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ura14h
ura14h committed Jan 5, 2020
1 parent 070952e commit 42782ec
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion OpenCVSample.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions ...penCVSample_OSX.xcodeproj/project.pbxproj → ...nCVSample_macOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
/* Begin PBXFileReference section */
310A3F0D23C1730400677B30 /* OpenCL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenCL.framework; path = System/Library/Frameworks/OpenCL.framework; sourceTree = SDKROOT; };
310A3F0F23C1732900677B30 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
311301EB23C0277100B7C7A5 /* OpenCVSample_OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenCVSample_OSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
311301EB23C0277100B7C7A5 /* OpenCVSample_macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenCVSample_macOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
311301EE23C0277100B7C7A5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
311301F023C0277100B7C7A5 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
311301F223C0277100B7C7A5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
311301F523C0277200B7C7A5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
311301F723C0277200B7C7A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
311301F823C0277200B7C7A5 /* OpenCVSample_OSX.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OpenCVSample_OSX.entitlements; sourceTree = "<group>"; };
311301FE23C02ED000B7C7A5 /* OpenCVSample_OSX-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpenCVSample_OSX-Bridging-Header.h"; sourceTree = "<group>"; };
311301F823C0277200B7C7A5 /* OpenCVSample_macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OpenCVSample_macOS.entitlements; sourceTree = "<group>"; };
311301FE23C02ED000B7C7A5 /* OpenCVSample_macOS-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpenCVSample_macOS-Bridging-Header.h"; sourceTree = "<group>"; };
3113020623C030F500B7C7A5 /* OpenCV.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenCV.h; sourceTree = "<group>"; };
3113020723C030F500B7C7A5 /* OpenCV.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenCV.mm; sourceTree = "<group>"; };
3113020E23C034AB00B7C7A5 /* opencv2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = opencv2.framework; sourceTree = "<group>"; };
Expand All @@ -50,7 +50,7 @@
311301E223C0277100B7C7A5 = {
isa = PBXGroup;
children = (
311301ED23C0277100B7C7A5 /* OpenCVSample_OSX */,
311301ED23C0277100B7C7A5 /* OpenCVSample_macOS */,
3113020C23C0347F00B7C7A5 /* Frameworks */,
311301EC23C0277100B7C7A5 /* Products */,
);
Expand All @@ -59,25 +59,25 @@
311301EC23C0277100B7C7A5 /* Products */ = {
isa = PBXGroup;
children = (
311301EB23C0277100B7C7A5 /* OpenCVSample_OSX.app */,
311301EB23C0277100B7C7A5 /* OpenCVSample_macOS.app */,
);
name = Products;
sourceTree = "<group>";
};
311301ED23C0277100B7C7A5 /* OpenCVSample_OSX */ = {
311301ED23C0277100B7C7A5 /* OpenCVSample_macOS */ = {
isa = PBXGroup;
children = (
311301EE23C0277100B7C7A5 /* AppDelegate.swift */,
311301F023C0277100B7C7A5 /* ViewController.swift */,
3113020623C030F500B7C7A5 /* OpenCV.h */,
3113020723C030F500B7C7A5 /* OpenCV.mm */,
311301FE23C02ED000B7C7A5 /* OpenCVSample_OSX-Bridging-Header.h */,
311301FE23C02ED000B7C7A5 /* OpenCVSample_macOS-Bridging-Header.h */,
311301F223C0277100B7C7A5 /* Assets.xcassets */,
311301F423C0277200B7C7A5 /* Main.storyboard */,
311301F723C0277200B7C7A5 /* Info.plist */,
311301F823C0277200B7C7A5 /* OpenCVSample_OSX.entitlements */,
311301F823C0277200B7C7A5 /* OpenCVSample_macOS.entitlements */,
);
path = OpenCVSample_OSX;
path = OpenCVSample_macOS;
sourceTree = "<group>";
};
3113020C23C0347F00B7C7A5 /* Frameworks */ = {
Expand All @@ -93,9 +93,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
311301EA23C0277100B7C7A5 /* OpenCVSample_OSX */ = {
311301EA23C0277100B7C7A5 /* OpenCVSample_macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 311301FB23C0277200B7C7A5 /* Build configuration list for PBXNativeTarget "OpenCVSample_OSX" */;
buildConfigurationList = 311301FB23C0277200B7C7A5 /* Build configuration list for PBXNativeTarget "OpenCVSample_macOS" */;
buildPhases = (
311301E723C0277100B7C7A5 /* Sources */,
311301E823C0277100B7C7A5 /* Frameworks */,
Expand All @@ -105,9 +105,9 @@
);
dependencies = (
);
name = OpenCVSample_OSX;
productName = OpenCVSample_OSX;
productReference = 311301EB23C0277100B7C7A5 /* OpenCVSample_OSX.app */;
name = OpenCVSample_macOS;
productName = OpenCVSample_macOS;
productReference = 311301EB23C0277100B7C7A5 /* OpenCVSample_macOS.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -126,7 +126,7 @@
};
};
};
buildConfigurationList = 311301E623C0277100B7C7A5 /* Build configuration list for PBXProject "OpenCVSample_OSX" */;
buildConfigurationList = 311301E623C0277100B7C7A5 /* Build configuration list for PBXProject "OpenCVSample_macOS" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand All @@ -139,7 +139,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
311301EA23C0277100B7C7A5 /* OpenCVSample_OSX */,
311301EA23C0277100B7C7A5 /* OpenCVSample_macOS */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -299,7 +299,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = OpenCVSample_OSX/OpenCVSample_OSX.entitlements;
CODE_SIGN_ENTITLEMENTS = OpenCVSample_macOS/OpenCVSample_macOS.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = U853Z6LKZW;
Expand All @@ -308,14 +308,14 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = OpenCVSample_OSX/Info.plist;
INFOPLIST_FILE = OpenCVSample_macOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "net.homeunix.hio.ipa.OpenCVSample-OSX";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "OpenCVSample_OSX/OpenCVSample_OSX-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "OpenCVSample_macOS/OpenCVSample_macOS-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
Expand All @@ -326,7 +326,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = OpenCVSample_OSX/OpenCVSample_OSX.entitlements;
CODE_SIGN_ENTITLEMENTS = OpenCVSample_macOS/OpenCVSample_macOS.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = U853Z6LKZW;
Expand All @@ -335,22 +335,22 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = OpenCVSample_OSX/Info.plist;
INFOPLIST_FILE = OpenCVSample_macOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "net.homeunix.hio.ipa.OpenCVSample-OSX";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "OpenCVSample_OSX/OpenCVSample_OSX-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "OpenCVSample_macOS/OpenCVSample_macOS-Bridging-Header.h";
SWIFT_VERSION = 5.0;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
311301E623C0277100B7C7A5 /* Build configuration list for PBXProject "OpenCVSample_OSX" */ = {
311301E623C0277100B7C7A5 /* Build configuration list for PBXProject "OpenCVSample_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
311301F923C0277200B7C7A5 /* Debug */,
Expand All @@ -359,7 +359,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
311301FB23C0277200B7C7A5 /* Build configuration list for PBXNativeTarget "OpenCVSample_OSX" */ = {
311301FB23C0277200B7C7A5 /* Build configuration list for PBXNativeTarget "OpenCVSample_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
311301FC23C0277200B7C7A5 /* Debug */,
Expand Down
0 ...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...le_OSX/OpenCVSample_OSX/AppDelegate.swift → ...acOS/OpenCVSample_macOS/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// AppDelegate.swift
// OpenCVSample_OSX
// OpenCVSample_macOS
//
// Created by Hiroki Ishiura on 2020/01/04.
// Copyright © 2020 Hiroki Ishiura. All rights reserved.
Expand Down
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
File renamed without changes.
0 ...VSample_OSX/Assets.xcassets/Contents.json → ...ample_macOS/Assets.xcassets/Contents.json
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions ...enCVSample_OSX/Base.lproj/Main.storyboard → ...CVSample_macOS/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<application id="hnw-xV-0zn" sceneMemberID="viewController">
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="OpenCVSample_OSX" id="1Xt-HY-uBw">
<menuItem title="OpenCVSample_macOS" id="1Xt-HY-uBw">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="OpenCVSample_OSX" systemMenu="apple" id="uQy-DD-JDr">
<menu key="submenu" title="OpenCVSample_macOS" systemMenu="apple" id="uQy-DD-JDr">
<items>
<menuItem title="About OpenCVSample_OSX" id="5kV-Vb-QxS">
<menuItem title="About OpenCVSample_macOS" id="5kV-Vb-QxS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
Expand All @@ -29,7 +29,7 @@
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide OpenCVSample_OSX" keyEquivalent="h" id="Olw-nP-bQN">
<menuItem title="Hide OpenCVSample_macOS" keyEquivalent="h" id="Olw-nP-bQN">
<connections>
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
</connections>
Expand All @@ -47,7 +47,7 @@
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
<menuItem title="Quit OpenCVSample_OSX" keyEquivalent="q" id="4sb-4s-VLi">
<menuItem title="Quit OpenCVSample_macOS" keyEquivalent="q" id="4sb-4s-VLi">
<connections>
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
</connections>
Expand Down Expand Up @@ -660,7 +660,7 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
<items>
<menuItem title="OpenCVSample_OSX Help" keyEquivalent="?" id="FKE-Sm-Kum">
<menuItem title="OpenCVSample_macOS Help" keyEquivalent="?" id="FKE-Sm-Kum">
<connections>
<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
</connections>
Expand All @@ -674,7 +674,7 @@
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="OpenCVSample_OSX" customModuleProvider="target"/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="OpenCVSample_macOS" customModuleProvider="target"/>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
Expand Down Expand Up @@ -704,7 +704,7 @@
<!--View Controller-->
<scene sceneID="hIz-AP-VOD">
<objects>
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="OpenCVSample_OSX" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="OpenCVSample_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down
0 OpenCVSample_OSX/OpenCVSample_OSX/Info.plist → ...ample_macOS/OpenCVSample_macOS/Info.plist
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion OpenCVSample_OSX/OpenCVSample_OSX/OpenCV.h → ...VSample_macOS/OpenCVSample_macOS/OpenCV.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// OpenCV.h
// OpenCVSample_OSX
// OpenCVSample_macOS
//
// Created by Hiroki Ishiura on 2020/01/04.
// Copyright © 2020 Hiroki Ishiura. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion OpenCVSample_OSX/OpenCVSample_OSX/OpenCV.mm → ...Sample_macOS/OpenCVSample_macOS/OpenCV.mm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// OpenCV.mm
// OpenCVSample_OSX
// OpenCVSample_macOS
//
// Created by Hiroki Ishiura on 2020/01/04.
// Copyright © 2020 Hiroki Ishiura. All rights reserved.
Expand Down
0 ...le_OSX/OpenCVSample_OSX-Bridging-Header.h → ...acOS/OpenCVSample_macOS-Bridging-Header.h
View file
File renamed without changes.
0 ...VSample_OSX/OpenCVSample_OSX.entitlements → ...ple_macOS/OpenCVSample_macOS.entitlements
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...OSX/OpenCVSample_OSX/ViewController.swift → ...S/OpenCVSample_macOS/ViewController.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// ViewController.swift
// OpenCVSample_OSX
// OpenCVSample_macOS
//
// Created by Hiroki Ishiura on 2020/01/04.
// Copyright © 2020 Hiroki Ishiura. All rights reserved.
Expand Down

0 comments on commit 42782ec

Please sign in to comment.