gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patched Xcode / gcc compilation conflict

Browse Source
This commit is contained in:
Joseph Henry
2016-06-22 14:15:37 -07:00
parent 0de93a39fa
commit 8bf7e23613
4 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.pbxproj
View File

@@ -1505,6 +1505,7 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DZT_SDK", "-DZT_SDK",
"-DZT_SDK_DEBUG", "-DZT_SDK_DEBUG",
"-D__XCODE__",
); );
PRODUCT_BUNDLE_IDENTIFIER = "zerotier.ZeroTierSDK-OSX"; PRODUCT_BUNDLE_IDENTIFIER = "zerotier.ZeroTierSDK-OSX";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1532,6 +1533,7 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DZT_SDK", "-DZT_SDK",
"-DZT_SDK_DEBUG", "-DZT_SDK_DEBUG",
"-D__XCODE__",
); );
PRODUCT_BUNDLE_IDENTIFIER = "zerotier.ZeroTierSDK-OSX"; PRODUCT_BUNDLE_IDENTIFIER = "zerotier.ZeroTierSDK-OSX";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";

BIN
integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

2
src/SDK_EthernetTap.cpp
View File

@@ -60,7 +60,7 @@
#include "SDK_Debug.c" #include "SDK_Debug.c"
#include "SDK_ServiceSetup.hpp" #include "SDK_ServiceSetup.hpp"
#if !defined(__IOS__) && !defined(__ANDROID__) && !defined(__UNITY_3D__) //&& !defined(__APPLE__) #if !defined(__IOS__) && !defined(__ANDROID__) && !defined(__UNITY_3D__) && !defined(__XCODE__)
const ip_addr_t ip_addr_any = { IPADDR_ANY }; const ip_addr_t ip_addr_any = { IPADDR_ANY };
#endif #endif