Skip to content

Commit eaf0323

Browse files
committed
removed ununsed jsoncpp lib on oF 0.10+, cleaned addon_config.mk
1 parent 5d9c8ac commit eaf0323

File tree

5 files changed

+10
-6345
lines changed

5 files changed

+10
-6345
lines changed

addon_config.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ common:
1313
# include search paths, this will be usually parsed from the file system
1414
# but if the addon or addon libraries need special search paths they can be
1515
# specified here separated by spaces or one per line using +=
16-
ADDON_INCLUDES = libs/jsoncpp
17-
ADDON_INCLUDES += libs/jsoncpp/json
18-
ADDON_INCLUDES += libs/libwebsockets/include/
16+
# ADDON_INCLUDES = libs/jsoncpp
17+
# ADDON_INCLUDES += libs/jsoncpp/json
18+
ADDON_INCLUDES = libs/libwebsockets/include/
1919
ADDON_INCLUDES += libs/ofxLibwebsockets/include
2020
ADDON_INCLUDES += libs/ofxLibwebsockets/include/ofxLibwebsockets
2121
ADDON_INCLUDES += libs/ofxLibwebsockets/src
@@ -107,11 +107,11 @@ vs:
107107

108108
linuxarmv6l:
109109
ADDON_LDFLAGS = -lssl
110-
ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
110+
# ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
111111
ADDON_LIBS = libs/libwebsockets/lib/linuxarmv6l/libwebsockets.a
112112
linuxarmv7l:
113113
ADDON_LDFLAGS = -lssl
114-
ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
114+
# ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
115115
ADDON_LIBS = libs/libwebsockets/lib/linuxarmv7l/libwebsockets.a
116116

117117
android/armeabi:
@@ -121,8 +121,8 @@ android/armeabi-v7a:
121121
#nothing yet
122122

123123
osx:
124-
ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port
125-
ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers
124+
# ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port
125+
# ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers
126126
# OpenSSL support for OSX 10.11+
127127
ADDON_INCLUDES += libs/openssl/include
128128
ADDON_LIBS += libs/openssl/lib/osx/libcrypto.a
@@ -134,7 +134,7 @@ osx:
134134
# ADDON_LIBS += ../../../libs/openssl/lib/osx/ssl.a
135135

136136
ios:
137-
ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port/.*
138-
ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers/.*
139-
ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/.*
137+
# ADDON_INCLUDES_EXCLUDE = libs/libwebsockets/include/win32port/.*
138+
# ADDON_INCLUDES_EXCLUDE += libs/libwebsockets/include/win32port/win32helpers/.*
139+
# ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/.*
140140
ADDON_LIBS = libs/libwebsockets/lib/iosarmv7/libwebsockets.a

libs/jsoncpp/json/json-forwards.h

Lines changed: 0 additions & 249 deletions
This file was deleted.

0 commit comments

Comments
 (0)