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

Tweaks to Xcode project settings

Browse Source 
* Made certain that the result would be a module
* Removed an unnecessary #include that caused errors when included in a project
This commit is contained in:
Evan Olcott
2020-12-01 16:00:03 -06:00
parent abbe7957c7
commit e94ca31944
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -486,11 +486,12 @@ if (IN_XCODE)
set_target_properties(${XCODE_FRAMEWORK_NAME} PROPERTIES set_target_properties(${XCODE_FRAMEWORK_NAME} PROPERTIES
FRAMEWORK TRUE FRAMEWORK TRUE
FRAMEWORK_VERSION A FRAMEWORK_VERSION A
DEFINES_MODULE TRUE XCODE_ATTRIBUTE_DEFINES_MODULE TRUE
MACOSX_FRAMEWORK_IDENTIFIER com.cmake.${XCODE_FRAMEWORK_NAME} MACOSX_FRAMEWORK_IDENTIFIER com.cmake.${XCODE_FRAMEWORK_NAME}
MODULEMAP_FILE "${PROJ_DIR}/ports/module.modulemap" XCODE_ATTRIBUTE_MODULEMAP_FILE "${PROJ_DIR}/ports/module.modulemap"
PUBLIC_HEADER "${frameworkHeaderGlob}" PUBLIC_HEADER "${frameworkHeaderGlob}"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer" XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer"
XCODE_ATTRIBUTE_CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES TRUE
) )
endif () endif ()

2
include/ZeroTierSockets.h
View File

@@ -20,8 +20,6 @@
#ifndef ZT_SOCKETS_H #ifndef ZT_SOCKETS_H
#define ZT_SOCKETS_H #define ZT_SOCKETS_H
#include <inttypes.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifndef ssize_t #ifndef ssize_t
// TODO: Should be SSIZE_T, would require lwIP patch // TODO: Should be SSIZE_T, would require lwIP patch