unity and native osx bundles and frameworks build from the same project now

This commit is contained in:
Joseph Henry
2016-06-16 11:47:08 -07:00
parent 621970619d
commit 699edf8f30
111 changed files with 11112 additions and 14 deletions

View File

@@ -57,7 +57,7 @@ void dwr(int level, const char *fmt, ... );
void dwr(int level, const char *fmt, ... )
{
#if defined(_SDK_DEBUG)
#if defined(ZT_SDK_DEBUG)
if(level > DEBUG_LEVEL)
return;
int saveerr;

View File

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

View File

@@ -25,6 +25,8 @@
* LLC. Start here: http://www.zerotier.com/
*/
#if defined(ZT_SDK_INTERCEPT)
#include <unistd.h>
#include <stdio.h>
#include <stdint.h>
@@ -569,3 +571,5 @@ pthread_key_t thr_id_key;
#endif
#endif
#endif // ZT_SDK_INTERCEPT

View File

@@ -132,9 +132,9 @@ extern "C" {
intercept_thread_id = (int*)malloc(sizeof(int));
*intercept_thread_id = mode;
pthread_setspecific(thr_id_key, intercept_thread_id);
#if !defined(__UNITY_3D__)
check_intercept_enabled_for_thread();
#endif
//#if !defined(__UNITY_3D__)
// check_intercept_enabled_for_thread();
//#endif
}
#endif