mirror
/
devilutionX-libzt
mirror of https://github.com/diasurgical/libzt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

adjusted OSX example app dir structure and search paths

pull/1/head
Joseph Henry 10 years ago
parent
e352c2a613
commit
4d032d5ec7
30 changed files with 21 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      integrations/apple/ZeroTierSDK_Apple/.DS_Store
  2. BIN
      integrations/apple/example_app/.DS_Store
  3. BIN
      integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate
  4. BIN
      integrations/apple/example_app/OSX/.DS_Store
  5. 37
      integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.pbxproj
  6. 0
      integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  7. BIN
      integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate
  8. 0
      integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  9. 0
      integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_OSX_App.xcscheme
  10. 0
      integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist
  11. 0
      integrations/apple/example_app/OSX/Example_OSX_App/AppDelegate.swift
  12. 0
      integrations/apple/example_app/OSX/Example_OSX_App/Assets.xcassets/AppIcon.appiconset/Contents.json
  13. 0
      integrations/apple/example_app/OSX/Example_OSX_App/Base.lproj/Main.storyboard
  14. 0
      integrations/apple/example_app/OSX/Example_OSX_App/Example_OSX_App-Bridging-Header.h
  15. 0
      integrations/apple/example_app/OSX/Example_OSX_App/Info.plist
  16. 0
      integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift
  17. BIN
      integrations/apple/example_app/iOS/.DS_Store
  18. 0
      integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/project.pbxproj
  19. 0
      integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  20. 0
      integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate
  21. 0
      integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_iOS_App.xcscheme
  22. 0
      integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist
  23. 0
      integrations/apple/example_app/iOS/Example_iOS_App/AppDelegate.swift
  24. 0
      integrations/apple/example_app/iOS/Example_iOS_App/Assets.xcassets/AppIcon.appiconset/Contents.json
  25. 0
      integrations/apple/example_app/iOS/Example_iOS_App/Base.lproj/LaunchScreen.storyboard
  26. 0
      integrations/apple/example_app/iOS/Example_iOS_App/Base.lproj/Main.storyboard
  27. 0
      integrations/apple/example_app/iOS/Example_iOS_App/Info.plist
  28. 0
      integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
  29. 4
      src/SDK_XcodeWrapper.cpp
  30. 2
      src/SDK_XcodeWrapper.hpp

BIN
integrations/apple/ZeroTierSDK_Apple/.DS_Store vendored
View File

Binary file not shown.

BIN
integrations/apple/example_app/.DS_Store vendored
View File

Binary file not shown.

BIN
integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

BIN
integrations/apple/example_app/OSX/.DS_Store vendored
View File

Binary file not shown.

37
integrations/apple/example_app/Example_OSX_App.xcodeproj/project.pbxproj → integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.pbxproj
Unescape View File

@ -7,10 +7,10 @@
objects = {
/* Begin PBXBuildFile section */
7CA571051D1B0DA100720883 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CA571031D1B0D9500720883 /* ZeroTierSDK_OSX.framework */; };
7CF8E36C1D2C3E0A001A8401 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CF8E36B1D2C3E0A001A8401 /* ZeroTierSDK_OSX.framework */; };
7CF8E3701D2C40F6001A8401 /* SDK_XcodeWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF8E36E1D2C40F6001A8401 /* SDK_XcodeWrapper.cpp */; };
7CF8E3711D2C4338001A8401 /* ZeroTierSDK_OSX.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7CF8E36B1D2C3E0A001A8401 /* ZeroTierSDK_OSX.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
7C74DACF1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C74DACD1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp */; };
7C74DAD21D3C47D300A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; };
7C74DAD31D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; };
7C74DAD41D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
7CFCB4311D1AFEE800D3E66C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFCB4301D1AFEE800D3E66C /* AppDelegate.swift */; };
7CFCB4331D1AFEE800D3E66C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFCB4321D1AFEE800D3E66C /* ViewController.swift */; };
7CFCB4351D1AFEE800D3E66C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7CFCB4341D1AFEE800D3E66C /* Assets.xcassets */; };
@ -24,7 +24,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
7CF8E3711D2C4338001A8401 /* ZeroTierSDK_OSX.framework in Embed Frameworks */,
7C74DAD41D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@ -32,12 +32,10 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
7CA571031D1B0D9500720883 /* ZeroTierSDK_OSX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZeroTierSDK_OSX.framework; path = /Users/Joseph/code/zerotiersdk/build/OSX_app_framework/Debug/ZeroTierSDK_OSX.framework; sourceTree = "<absolute>"; };
7CA571081D1B1DCB00720883 /* ZeroTierSDK_OSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZeroTierSDK_OSX.h; path = ../../ZeroTierSDK_Apple/ZeroTierSDK_OSX/ZeroTierSDK_OSX.h; sourceTree = "<group>"; };
7CF8E36B1D2C3E0A001A8401 /* ZeroTierSDK_OSX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZeroTierSDK_OSX.framework; path = ../../../build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework; sourceTree = "<group>"; };
7C74DACD1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_XcodeWrapper.cpp; path = ../../../../../src/SDK_XcodeWrapper.cpp; sourceTree = "<group>"; };
7C74DACE1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_XcodeWrapper.hpp; path = ../../../../../src/SDK_XcodeWrapper.hpp; sourceTree = "<group>"; };
7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZeroTierSDK_OSX.framework; path = ../../../../build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework; sourceTree = "<group>"; };
7CF8E36D1D2C40F6001A8401 /* Example_OSX_App-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Example_OSX_App-Bridging-Header.h"; sourceTree = "<group>"; };
7CF8E36E1D2C40F6001A8401 /* SDK_XcodeWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_XcodeWrapper.cpp; path = ../../../../src/SDK_XcodeWrapper.cpp; sourceTree = "<group>"; };
7CF8E36F1D2C40F6001A8401 /* SDK_XcodeWrapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_XcodeWrapper.hpp; path = ../../../../src/SDK_XcodeWrapper.hpp; sourceTree = "<group>"; };
7CFCB42D1D1AFEE800D3E66C /* Example_OSX_App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example_OSX_App.app; sourceTree = BUILT_PRODUCTS_DIR; };
7CFCB4301D1AFEE800D3E66C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7CFCB4321D1AFEE800D3E66C /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@ -51,8 +49,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
7CF8E36C1D2C3E0A001A8401 /* ZeroTierSDK_OSX.framework in Frameworks */,
7CA571051D1B0DA100720883 /* ZeroTierSDK_OSX.framework in Frameworks */,
7C74DAD31D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */,
7C74DAD21D3C47D300A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -62,7 +60,7 @@
7CFCB4241D1AFEE800D3E66C = {
isa = PBXGroup;
children = (
7CF8E36B1D2C3E0A001A8401 /* ZeroTierSDK_OSX.framework */,
7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */,
7CFCB42F1D1AFEE800D3E66C /* Example_OSX_App */,
7CFCB42E1D1AFEE800D3E66C /* Products */,
);
@ -79,9 +77,8 @@
7CFCB42F1D1AFEE800D3E66C /* Example_OSX_App */ = {
isa = PBXGroup;
children = (
7CF8E36E1D2C40F6001A8401 /* SDK_XcodeWrapper.cpp */,
7CF8E36F1D2C40F6001A8401 /* SDK_XcodeWrapper.hpp */,
7CA571081D1B1DCB00720883 /* ZeroTierSDK_OSX.h */,
7C74DACD1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp */,
7C74DACE1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.hpp */,
7CFCB4301D1AFEE800D3E66C /* AppDelegate.swift */,
7CFCB4321D1AFEE800D3E66C /* ViewController.swift */,
7CFCB4341D1AFEE800D3E66C /* Assets.xcassets */,
@ -164,7 +161,7 @@
buildActionMask = 2147483647;
files = (
7CFCB4331D1AFEE800D3E66C /* ViewController.swift in Sources */,
7CF8E3701D2C40F6001A8401 /* SDK_XcodeWrapper.cpp in Sources */,
7C74DACF1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp in Sources */,
7CFCB4311D1AFEE800D3E66C /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -273,7 +270,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../src";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../../build/OSX_app_framework/Debug";
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../../src";
INFOPLIST_FILE = Example_OSX_App/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "zerotier.Example-OSX-App";
@ -290,7 +288,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../src";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../../build/OSX_app_framework/Debug";
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../../src";
INFOPLIST_FILE = Example_OSX_App/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "zerotier.Example-OSX-App";

0
integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata → integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
Unescape View File

BIN
integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

0
integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist → integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Unescape View File

0
integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_OSX_App.xcscheme → integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_OSX_App.xcscheme
Unescape View File

0
integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist → integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist
Unescape View File

0
integrations/apple/example_app/Example_OSX_App/AppDelegate.swift → integrations/apple/example_app/OSX/Example_OSX_App/AppDelegate.swift
Unescape View File

0
integrations/apple/example_app/Example_OSX_App/Assets.xcassets/AppIcon.appiconset/Contents.json → integrations/apple/example_app/OSX/Example_OSX_App/Assets.xcassets/AppIcon.appiconset/Contents.json
Unescape View File

0
integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard → integrations/apple/example_app/OSX/Example_OSX_App/Base.lproj/Main.storyboard
Unescape View File

0
integrations/apple/example_app/Example_OSX_App/Example_OSX_App-Bridging-Header.h → integrations/apple/example_app/OSX/Example_OSX_App/Example_OSX_App-Bridging-Header.h
Unescape View File

0
integrations/apple/example_app/Example_OSX_App/Info.plist → integrations/apple/example_app/OSX/Example_OSX_App/Info.plist
Unescape View File

0
integrations/apple/example_app/Example_OSX_App/ViewController.swift → integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift
Unescape View File

BIN
integrations/apple/example_app/iOS/.DS_Store vendored
View File

Binary file not shown.

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.pbxproj → integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/project.pbxproj
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata → integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate → integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_iOS_App.xcscheme → integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_iOS_App.xcscheme
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist → integrations/apple/example_app/iOS/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App/AppDelegate.swift → integrations/apple/example_app/iOS/Example_iOS_App/AppDelegate.swift
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Assets.xcassets/AppIcon.appiconset/Contents.json → integrations/apple/example_app/iOS/Example_iOS_App/Assets.xcassets/AppIcon.appiconset/Contents.json
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/LaunchScreen.storyboard → integrations/apple/example_app/iOS/Example_iOS_App/Base.lproj/LaunchScreen.storyboard
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/Main.storyboard → integrations/apple/example_app/iOS/Example_iOS_App/Base.lproj/Main.storyboard
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Info.plist → integrations/apple/example_app/iOS/Example_iOS_App/Info.plist
Unescape View File

0
integrations/apple/example_app/Example_iOS_App/Example_iOS_App/ViewController.swift → integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
Unescape View File

4
src/SDK_XcodeWrapper.cpp
Unescape View File

@ -1,6 +1,6 @@
//
// NetconWrapper.cpp
// Netcon-iOS
// SDK_XcodeWrapper.cpp
// SDK-iOS
//
// Created by Joseph Henry on 2/14/16.
// Copyright © 2016 ZeroTier. All rights reserved.

2
src/SDK_XcodeWrapper.hpp
Unescape View File

@ -1,6 +1,6 @@
//
// SDK_XcodeWrapper.hpp
// Netcon-iOS
// SDK-iOS
//
// Created by Joseph Henry on 2/14/16.
// Copyright © 2016 ZeroTier. All rights reserved.

Write Preview
Loading…
Cancel
Save