Skip to content

Commit

Permalink
enable gif support when building mac
Browse files Browse the repository at this point in the history
  • Loading branch information
mfiess committed Aug 2, 2019
1 parent e7cc552 commit 5e761e5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ci/build_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ then
echo "***************************** Generating config files ****" >> $BUILDLOGS
if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ "$TRAVIS_EVENT_TYPE" != "api" ] && [ -z "${TRAVIS_TAG}" ]
then
cmake -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON -DENABLE_THREAD_SANITIZER=ON .. >>$BUILDLOGS 2>&1;
cmake -DBUILD_WITH_GIF=ON -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON -DENABLE_THREAD_SANITIZER=ON .. >>$BUILDLOGS 2>&1;
else
if [ "$TRAVIS_EVENT_TYPE" == "cron" ] ;
then
Expand All @@ -55,9 +55,9 @@ then
cp ../examples/pxScene2d/src/macstuff/Resources/SparkEdge.icns ../examples/pxScene2d/src/macstuff/dmgresources/pxscene.icns
cp ../examples/pxScene2d/src/browser/images/status_bg_edge.svg ../examples/pxScene2d/src/browser/images/status_bg.svg

cmake -DSUPPORT_DUKTAPE=OFF -DPXSCENE_VERSION=edge_`date +%Y-%m-%d` .. >>$BUILDLOGS 2>&1;
cmake -DBUILD_WITH_GIF=ON -DSUPPORT_DUKTAPE=OFF -DPXSCENE_VERSION=edge_`date +%Y-%m-%d` .. >>$BUILDLOGS 2>&1;
else
cmake -DSUPPORT_DUKTAPE=OFF .. >>$BUILDLOGS 2>&1;
cmake -DBUILD_WITH_GIF=ON -DSUPPORT_DUKTAPE=OFF .. >>$BUILDLOGS 2>&1;
fi
fi

Expand All @@ -70,7 +70,7 @@ then
else

echo "***************************** Generating config files ****"
cmake -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=OFF -DPXSCENE_TEST_HTTP_CACHE=ON -DENABLE_THREAD_SANITIZER=ON .. 1>>$BUILDLOGS;
cmake -DBUILD_WITH_GIF=ON -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=OFF -DPXSCENE_TEST_HTTP_CACHE=ON -DENABLE_THREAD_SANITIZER=ON .. 1>>$BUILDLOGS;
checkError $? 1 "cmake config failed" "Config error" "Check the errors displayed in this window"

echo "***************************** Building pxcore,rtcore,pxscene app,libpxscene,unitttests ****" >> $BUILDLOGS
Expand Down

0 comments on commit 5e761e5

Please sign in to comment.