Skip to content

Commit 9646831

Browse files
danoli3danoli3
committed
Update addon_config
1 parent ca6898b commit 9646831

File tree

8 files changed

+32
-29
lines changed

8 files changed

+32
-29
lines changed

‎addons/ofxAssimp/addon_config.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ common:
6262
# a specific platform
6363
# ADDON_LIBS_EXCLUDE =
6464

65-
linuxarmv6l:
65+
linux/armv6l:
6666
ADDON_PKG_CONFIG_LIBRARIES = assimp
6767
ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
6868
ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
6969

70-
linuxarmv7l:
70+
linux/armv7l:
7171
ADDON_PKG_CONFIG_LIBRARIES = assimp
7272
ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
7373
ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
7474

75-
linuxaarch64:
75+
linux/aarch64:
7676
ADDON_PKG_CONFIG_LIBRARIES = assimp
7777
ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
7878
ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
@@ -82,7 +82,7 @@ linux:
8282
ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
8383
ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
8484

85-
linux64:
85+
linux/64:
8686
ADDON_PKG_CONFIG_LIBRARIES = assimp
8787
ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
8888
ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%

‎addons/ofxAssimpModelLoader/addon_config.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ common:
6060
# a specific platform
6161
# ADDON_LIBS_EXCLUDE =
6262

63-
linuxarmv6l:
63+
linux/armv6l:
6464
ADDON_PKG_CONFIG_LIBRARIES = assimp
6565
ADDON_LIBS_EXCLUDE = libs/assimp
6666
ADDON_INCLUDES_EXCLUDE = libs/assimp/%
6767

68-
linuxarmv7l:
68+
linux/armv7l:
6969
ADDON_PKG_CONFIG_LIBRARIES = assimp
7070
ADDON_LIBS_EXCLUDE = libs/assimp
7171
ADDON_INCLUDES_EXCLUDE = libs/assimp/%
7272

73-
linuxaarch64:
73+
linux/aarch64:
7474
ADDON_PKG_CONFIG_LIBRARIES = assimp
7575
ADDON_LIBS_EXCLUDE = libs/assimp
7676
ADDON_INCLUDES_EXCLUDE = libs/assimp/%
@@ -80,7 +80,7 @@ linux:
8080
ADDON_LIBS_EXCLUDE = libs/assimp
8181
ADDON_INCLUDES_EXCLUDE = libs/assimp/%
8282

83-
linux64:
83+
linux/64:
8484
ADDON_PKG_CONFIG_LIBRARIES = assimp
8585
ADDON_LIBS_EXCLUDE = libs/assimp
8686
ADDON_INCLUDES_EXCLUDE = libs/assimp/%

‎addons/ofxKinect/addon_config.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ common:
6868
# a specific platform
6969
# ADDON_INCLUDES_EXCLUDE =
7070

71-
linux64:
71+
linux/64:
7272
# linux only, any library that should be included in the project using
7373
# pkg-config
7474
ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0
@@ -127,7 +127,7 @@ vs:
127127
# when parsing the file system looking for include paths exclude this for all or
128128
# a specific platform
129129

130-
linuxarmv6l:
130+
linux/armv6l:
131131
# linux only, any library that should be included in the project using
132132
# pkg-config
133133
ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0
@@ -143,7 +143,7 @@ linuxarmv6l:
143143
ADDON_INCLUDES_EXCLUDE += libs/libusb-1.0/%
144144

145145

146-
linuxarmv7l:
146+
linux/armv7l:
147147
# linux only, any library that should be included in the project using
148148
# pkg-config
149149
ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0
@@ -158,7 +158,7 @@ linuxarmv7l:
158158
ADDON_INCLUDES_EXCLUDE = libs/libfreenect/platform/%
159159
ADDON_INCLUDES_EXCLUDE += libs/libusb-1.0/%
160160

161-
linuxaarch64:
161+
linuxa/arch64:
162162
# linux only, any library that should be included in the project using
163163
# pkg-config
164164
ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0

‎addons/ofxKinect/libs/libfreenect/platform/windows/unistd.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
#pragma once
2828

29+
#ifdef _WIN32
30+
2931
#include <stdint.h>
3032
#include <windows.h>
3133

@@ -53,3 +55,4 @@ static void usleep(__int64 usec)
5355
WaitForSingleObject(timer, INFINITE);
5456
CloseHandle(timer);
5557
}
58+
#endif

‎addons/ofxOpenCv/addon_config.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ common:
6060
# a specific platform
6161
# ADDON_LIBS_EXCLUDE =
6262

63-
linux64:
63+
linux/64:
6464
ADDON_PKG_CONFIG_LIBRARIES = opencv4 harfbuzz
6565
ADDON_LIBS_EXCLUDE = libs/opencv/%
6666
ADDON_INCLUDES_EXCLUDE = libs/opencv
@@ -72,19 +72,19 @@ linux:
7272
ADDON_INCLUDES_EXCLUDE = libs/opencv
7373
ADDON_INCLUDES_EXCLUDE += libs/opencv/%
7474

75-
linuxarmv6l:
75+
linux/armv6l:
7676
ADDON_PKG_CONFIG_LIBRARIES = opencv4
7777
ADDON_LIBS_EXCLUDE = libs/opencv/%
7878
ADDON_INCLUDES_EXCLUDE = libs/opencv
7979
ADDON_INCLUDES_EXCLUDE += libs/opencv/%
8080

81-
linuxarmv7l:
81+
linux/armv7l:
8282
ADDON_PKG_CONFIG_LIBRARIES = opencv4
8383
ADDON_LIBS_EXCLUDE = libs/opencv/%
8484
ADDON_INCLUDES_EXCLUDE = libs/opencv
8585
ADDON_INCLUDES_EXCLUDE += libs/opencv/%
8686

87-
linuxaarch64:
87+
linux/aarch64:
8888
ADDON_PKG_CONFIG_LIBRARIES = opencv4
8989
ADDON_LIBS_EXCLUDE = libs/opencv/%
9090
ADDON_INCLUDES_EXCLUDE = libs/opencv

‎addons/ofxOsc/addon_config.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,23 @@ common:
6868
# a specific platform
6969
# ADDON_INCLUDES_EXCLUDE =
7070

71-
linuxarmv6l:
71+
linux/armv6l:
7272
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
7373
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
7474

75-
linuxarmv7l:
75+
linux/armv7l:
7676
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
7777
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
7878

79-
linuxaarch64:
79+
linux/aarch64:
8080
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
8181
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
8282

8383
linux:
8484
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
8585
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
8686

87-
linux64:
87+
linux/64:
8888
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
8989
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
9090

‎addons/ofxPoco/addon_config.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ common:
6565
ADDON_SOURCES_EXCLUDE = libs/poco/include/%
6666

6767
linux:
68-
ADDON_LDFLAGS = -lPocoNetSSL
68+
ADDON_LDFLAGS = -lPocoNetSSL
6969
ADDON_LDFLAGS += -lPocoNet
7070
ADDON_LDFLAGS += -lPocoCrypto
7171
ADDON_LDFLAGS += -lPocoUtil
@@ -74,8 +74,8 @@ linux:
7474
ADDON_LDFLAGS += -lcrypto
7575
ADDON_LDFLAGS += -lssl
7676

77-
linux64:
78-
ADDON_LDFLAGS = -lPocoNetSSL
77+
linux/64:
78+
ADDON_LDFLAGS = -lPocoNetSSL
7979
ADDON_LDFLAGS += -lPocoNet
8080
ADDON_LDFLAGS += -lPocoCrypto
8181
ADDON_LDFLAGS += -lPocoUtil
@@ -84,7 +84,7 @@ linux64:
8484
ADDON_LDFLAGS += -lcrypto
8585
ADDON_LDFLAGS += -lssl
8686

87-
linuxarmv6l:
87+
linux/armv6l:
8888
ADDON_LDFLAGS = -lPocoNetSSL
8989
ADDON_LDFLAGS += -lPocoNet
9090
ADDON_LDFLAGS += -lPocoCrypto
@@ -94,7 +94,7 @@ linuxarmv6l:
9494
ADDON_LDFLAGS += -lcrypto
9595
ADDON_LDFLAGS += -lssl
9696

97-
linuxarmv7l:
97+
linux/armv7l:
9898
ADDON_LDFLAGS = -lPocoNetSSL
9999
ADDON_LDFLAGS += -lPocoNet
100100
ADDON_LDFLAGS += -lPocoCrypto

‎addons/ofxSvg/addon_config.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ ios:
6868
ADDON_LIBS = libs/svgtiny/lib/ios/svgtiny.a
6969
ADDON_LIBS += libs/libxml2/lib/ios/xml2.a
7070

71-
linux64:
71+
linux/64:
7272
ADDON_LIBS = libs/svgtiny/lib/linux/64/libsvgtiny.a
7373
ADDON_LIBS += libs/libxml2/lib/linux/64/libxml2.a
7474

75-
linuxarmv6l:
75+
linux/armv6l:
7676
ADDON_LIBS = libs/svgtiny/lib/linux/armv6l/libsvgtiny.a
7777
ADDON_LIBS += libs/libxml2/lib/linux/armv6l/libxml2.a
7878

79-
linuxarmv7l:
79+
linux/armv7l:
8080
ADDON_LIBS = libs/svgtiny/lib/linux/armv7l/libsvgtiny.a
8181
ADDON_LIBS += libs/libxml2/lib/linux/armv7l/libxml2.a
8282

83-
linuxaarch64:
83+
linux/aarch64:
8484
ADDON_LIBS = libs/svgtiny/lib/linux/aarch64/libsvgtiny.a
8585
ADDON_LIBS += libs/libxml2/lib/linux/aarch64/libxml2.a
8686

0 commit comments

Comments
 (0)