Skip to content

Commit 77663bf

Browse files
authored
pg use nightly vs (#8028)
* pg use nightly vs * Addon config for osx was the cause * config fix
1 parent 63a3db6 commit 77663bf

File tree

2 files changed

+45
-3
lines changed

2 files changed

+45
-3
lines changed

addons/ofxOsc/addon_config.mk

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,63 @@ common:
6262

6363
# when parsing the file system looking for sources exclude this for all or
6464
# a specific platform
65-
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
66-
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
65+
#ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
66+
#ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
6767
# when parsing the file system looking for include paths exclude this for all or
6868
# a specific platform
6969
# ADDON_INCLUDES_EXCLUDE =
7070

71+
linuxarmv6l:
72+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
73+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
74+
75+
linuxarmv7l:
76+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
77+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
78+
79+
linuxaarch64:
80+
AADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
81+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
82+
83+
linux:
84+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
85+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
86+
87+
linux64:
88+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
89+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
90+
91+
osx:
92+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
93+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
94+
95+
# android:
96+
# ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
97+
# ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
98+
99+
emscripten:
100+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
101+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
102+
103+
ios:
104+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
105+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
106+
107+
macos:
108+
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
109+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
110+
71111
msys2:
72112
# when parsing the file system looking for sources exclude this for all or
73113
# a specific platform
74114
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/posix/%
115+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/posix
75116

76117
vs:
77118
# when parsing the file system looking for sources exclude this for all or
78119
# a specific platform
79120
ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/posix/%
121+
ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/posix
80122
ADDON_DEFINES = OSC_HOST_LITTLE_ENDIAN
81123

82124

scripts/ci/vs/install_bleeding.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mkdir -p ~/projectGenerator
1414
cd ~/projectGenerator
1515

1616
echo "Downloading projectGenerator from Github Bleeding"
17-
downloader https://github.com/openframeworks/projectGenerator/releases/download/bleeding/projectGenerator-vs.zip 2> /dev/null
17+
downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null
1818
unzip projectGenerator-vs.zip 2> /dev/null
1919
rm projectGenerator-vs.zip
2020

0 commit comments

Comments
 (0)