Skip to content

Commit 66fa605

Browse files
authored
Merge pull request #7793 from danoli3/latest_libraries
Latest -b libraries dev script file paths updated Merging just minor dev script changes
2 parents d8e59bb + ec9dec5 commit 66fa605

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,4 @@ Desktop.ini
134134
.mailmap
135135
/apps*/
136136
projectGenerator*/
137+
.cxx/

scripts/dev/download_libs.sh

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ fi
163163
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
164164
cd "$SCRIPT_DIR"
165165

166+
if [[ $BLEEDING_EDGE = 1 ]] ; then
167+
VER=bleeding
168+
fi
169+
166170
if [ "$PLATFORM" == "msys2" ]; then
167171
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}.zip"
168172
elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "vs" ]; then
@@ -176,16 +180,34 @@ elif [ "$PLATFORM" == "vs" ]; then
176180
openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_3.zip \
177181
openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_4.zip"
178182
elif [ "$ARCH" == "" ] && [[ "$PLATFORM" == "osx" || "$PLATFORM" == "ios" || "$PLATFORM" == "tvos" ]]; then
179-
PKGS="openFrameworksLibs_${VER}_${PLATFORM}1.tar.bz2 \
180-
openFrameworksLibs_${VER}_${PLATFORM}2.tar.bz2 \
181-
openFrameworksLibs_${VER}_${PLATFORM}3.tar.bz2 \
182-
openFrameworksLibs_${VER}_${PLATFORM}4.tar.bz2"
183+
if [[ $BLEEDING_EDGE = 1 ]] ; then
184+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_1.tar.bz2 \
185+
openFrameworksLibs_${VER}_${PLATFORM}_2.tar.bz2 \
186+
openFrameworksLibs_${VER}_${PLATFORM}_3.tar.bz2 \
187+
openFrameworksLibs_${VER}_${PLATFORM}_4.tar.bz2"
188+
else
189+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}1.tar.bz2 \
190+
openFrameworksLibs_${VER}_${PLATFORM}2.tar.bz2 \
191+
openFrameworksLibs_${VER}_${PLATFORM}3.tar.bz2 \
192+
openFrameworksLibs_${VER}_${PLATFORM}4.tar.bz2"
193+
fi
183194
elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "android" ]; then
184-
PKGS="openFrameworksLibs_${VER}_${PLATFORM}armv7.tar.bz2 \
195+
if [[ $BLEEDING_EDGE = 1 ]] ; then
196+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_armv7.tar.bz2 \
197+
openFrameworksLibs_${VER}_${PLATFORM}_arm64.tar.bz2 \
198+
openFrameworksLibs_${VER}_${PLATFORM}_x86_64.tar.bz2
199+
openFrameworksLibs_${VER}_${PLATFORM}_x86.tar.bz2"
200+
else
201+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}armv7.tar.bz2 \
185202
openFrameworksLibs_${VER}_${PLATFORM}arm64.tar.bz2 \
186203
openFrameworksLibs_${VER}_${PLATFORM}x86.tar.bz2"
204+
fi
187205
else # Linux
188-
PKGS="openFrameworksLibs_${VER}_${PLATFORM}${ARCH}.tar.bz2"
206+
if [[ $BLEEDING_EDGE = 1 ]] ; then
207+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}.tar.bz2"
208+
else
209+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}${ARCH}.tar.bz2"
210+
fi
189211
fi
190212

191213
for PKG in $PKGS; do

0 commit comments

Comments
 (0)