Merge pull request #106 from jeffcrouse/master

updated for 10.1

Author: robotconscience

addon_config.mk

@@ -13,9 +13,9 @@ common:
 	# include search paths, this will be usually parsed from the file system
 	# but if the addon or addon libraries need special search paths they can be
 	# specified here separated by spaces or one per line using +=
-	ADDON_INCLUDES = libs/jsoncpp
-	ADDON_INCLUDES += libs/jsoncpp/json
-	ADDON_INCLUDES += libs/libwebsockets/include/
+	# ADDON_INCLUDES = libs/jsoncpp
+	# ADDON_INCLUDES += libs/jsoncpp/json
+	ADDON_INCLUDES  = libs/libwebsockets/include/
 	ADDON_INCLUDES += libs/ofxLibwebsockets/include
 	ADDON_INCLUDES += libs/ofxLibwebsockets/include/ofxLibwebsockets
 	ADDON_INCLUDES += libs/ofxLibwebsockets/src
@@ -107,11 +107,11 @@ vs:
 
 linuxarmv6l:
 	ADDON_LDFLAGS = -lssl
-	ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
+	# ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
 	ADDON_LIBS = libs/libwebsockets/lib/linuxarmv6l/libwebsockets.a
 linuxarmv7l:
 	ADDON_LDFLAGS = -lssl
-	ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
+	# ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
 	ADDON_LIBS = libs/libwebsockets/lib/linuxarmv7l/libwebsockets.a
 
 android/armeabi:	
@@ -121,20 +121,20 @@ android/armeabi-v7a:
 	#nothing yet
 
 osx:
-	ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port
-	ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers
+	# ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port
+	# ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers
 	# OpenSSL support for OSX 10.11+
-	ADDON_INCLUDES += ../../../libs/openssl/include
-	ADDON_LIBS += ../../../libs/openssl/lib/osx/libcrypto.a
-    ADDON_LIBS += ../../../libs/openssl/lib/osx/libssl.a
+	ADDON_INCLUDES 	+= libs/openssl/include
+	ADDON_LIBS 		+= libs/openssl/lib/osx/libcrypto.a
+	ADDON_LIBS 		+= libs/openssl/lib/osx/libssl.a
 
 	# OpenSSL support for OSX 10.11+
-	ADDON_INCLUDES += ../../../libs/openssl/include
-	ADDON_LIBS += ../../../libs/openssl/lib/osx/crypto.a
-    ADDON_LIBS += ../../../libs/openssl/lib/osx/ssl.a
+	# ADDON_INCLUDES += ../../../libs/openssl/include
+	# ADDON_LIBS += ../../../libs/openssl/lib/osx/crypto.a
+	# ADDON_LIBS += ../../../libs/openssl/lib/osx/ssl.a
 
 ios:
-	ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port/.*
-	ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers/.*
-	ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/.*
+	# ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port/.*
+	# ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers/.*
+	# ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/.*
 	ADDON_LIBS = libs/libwebsockets/lib/iosarmv7/libwebsockets.a

example_client_blob/.vs/example_client_blob/v15/Browse.VC.db

@@ -13,5 +13,6 @@ ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/
 //IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
 //ICON_FILE_PATH = bin/data/
 
+OTHER_CFLAGS = $(OF_CORE_CFLAGS)
 OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
 HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)

example_client_blob/.vs/example_client_blob/v15/Solution.VC.db

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 15
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_client_blob", "example_client_blob.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"