Updates to iOS.cmake

Author: robotconscience

extras/ios_libwebsockets/lws_config.h

@@ -1,15 +1,17 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-#ifndef WIN32
-#define _DEBUG
+#ifndef NDEBUG
+	#ifndef _DEBUG
+		#define _DEBUG
+	#endif
 #endif
 
 /* Define to 1 to use CyaSSL as a replacement for OpenSSL. 
  * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */
 /* #undef USE_CYASSL */
 
 /* The Libwebsocket version */
-#define LWS_LIBRARY_VERSION "1.3"
+#define LWS_LIBRARY_VERSION "1.4"
 
 /* The current git commit hash that we're building from */
 /* #undef LWS_BUILD_HASH */
@@ -146,29 +148,23 @@
    */
 #undef LT_OBJDIR // We're not using libtool
 
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
 /* Version number of package */
 #define VERSION
 
 /* Define to rpl_malloc if the replacement function should be used. */
-//#define malloc
+// #define malloc
 
 /* Define to `int' if <sys/types.h> does not define. */
-//#define pid_t
+// #define pid_t
 
 /* Define to rpl_realloc if the replacement function should be used. */
-//#define realloc
+// #define realloc
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
-//#ifndef _SIZE_T
-//#define _SIZE_T
-//typedef __darwin_size_t size_t
-//#endif
+// #define size_t
 
 /* Define to 1 if we have getifaddrs */
-/* #undef HAVE_GETIFADDRS */
+#define HAVE_GETIFADDRS
 
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */

extras/ios_libwebsockets/toolchain/iOS.cmake

@@ -27,8 +27,8 @@ set (IOS True)
 
 # Force the compilers to gcc for iOS
 include (CMakeForceCompiler)
-CMAKE_FORCE_C_COMPILER (gcc gcc)
-CMAKE_FORCE_CXX_COMPILER (g++ g++)
+CMAKE_FORCE_C_COMPILER(/usr/bin/gcc GNU)
+CMAKE_FORCE_CXX_COMPILER(/usr/bin/g++ GNU)
 
 # Skip the platform compiler checks for cross compiling
 set (CMAKE_CXX_COMPILER_WORKS TRUE)
@@ -92,26 +92,23 @@ set( CMAKE_IOS_SDK_ROOT, "/Applications/Xcode.app/Contents/Developer/Platforms/i
 if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
 	set (CMAKE_IOS_DEVELOPER_ROOT "/Applications/Xcode.app/Contents/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
 else (DEFINED CMAKE_IOS_DEVELOPER_ROOT)
-	message(STATUS "FART")
+	message(STATUS "IOS DEV ROOT DEF")
 endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
 set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform")
 
 # Find and use the most recent iOS sdk 
 if (NOT DEFINED CMAKE_IOS_SDK_ROOT)
 	file (GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
 	if (_CMAKE_IOS_SDKS) 
-		message(STATUS "FART 2")
 		list (SORT _CMAKE_IOS_SDKS)
-		message(STATUS "FART 3")
 		list (REVERSE _CMAKE_IOS_SDKS)
-		message(STATUS "FART 4")
 		list (GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT)
 	else (_CMAKE_IOS_SDKS)
 		message( FATAL_ERROR "Crap")
 	endif (_CMAKE_IOS_SDKS)
 	message (STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}")
 else (DEFINED CMAKE_IOS_SDK_ROOT)
-	message(STATUS "FART 2")
+	message(STATUS "CMAKE IOS SDK ROOTS DEFINED")
 endif (NOT DEFINED CMAKE_IOS_SDK_ROOT)
 set (CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK")
 
@@ -139,4 +136,3 @@ set (CMAKE_SYSTEM_FRAMEWORK_PATH
 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
 set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-