From f46b1f94e4fdb6644a47b1715325f0595bf8fe77 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 7 Dec 2017 22:16:12 +0000 Subject: Gem 3985c1f4e4e349d2d84d364f3b36878899d6a364 osx/i386 built 'master:3985c1f4e4e349d2d84d364f3b36878899d6a364' for osx/i386 --- Gem/Gem.la | 2 +- Gem/Gem.pd_darwin | Bin 4835588 -> 4835588 bytes Gem/develop/include/Gem/Utils/nop.h | 7 ++++--- Gem/gem_filmAVFoundation.la | 2 +- Gem/gem_filmAVFoundation.so | Bin 34776 -> 34776 bytes Gem/gem_imageJPEG.la | 2 +- Gem/gem_imageJPEG.so | Bin 50452 -> 50452 bytes Gem/gem_imageMAGICK.la | 2 +- Gem/gem_imageMAGICK.so | Bin 52672 -> 52672 bytes Gem/gem_imageSGI.la | 2 +- Gem/gem_imageSGI.so | Bin 57276 -> 57276 bytes Gem/gem_imageTIFF.la | 2 +- Gem/gem_imageTIFF.so | Bin 65548 -> 65548 bytes Gem/gem_modelOBJ.la | 2 +- Gem/gem_modelOBJ.so | Bin 86564 -> 86564 bytes Gem/gemcocoawindow.la | 2 +- Gem/gemcocoawindow.pd_darwin | Bin 38484 -> 38484 bytes Gem/gemglfw3window.la | 2 +- Gem/gemglfw3window.pd_darwin | Bin 36396 -> 36396 bytes Gem/gemglutwindow.la | 2 +- Gem/gemglutwindow.pd_darwin | Bin 42388 -> 42388 bytes Gem/gemsdlwindow.la | 2 +- Gem/gemsdlwindow.pd_darwin | Bin 39584 -> 39584 bytes Gem/pix_drum.la | 2 +- Gem/pix_drum.pd_darwin | Bin 25560 -> 25560 bytes Gem/pix_fiducialtrack.la | 2 +- Gem/pix_fiducialtrack.pd_darwin | Bin 69740 -> 69740 bytes Gem/pix_hit.la | 2 +- Gem/pix_hit.pd_darwin | Bin 23232 -> 23232 bytes Gem/pix_mano.la | 2 +- Gem/pix_mano.pd_darwin | Bin 39564 -> 39564 bytes 31 files changed, 19 insertions(+), 18 deletions(-) (limited to 'Gem') diff --git a/Gem/Gem.la b/Gem/Gem.la index beb4088..6f72142 100755 --- a/Gem/Gem.la +++ b/Gem/Gem.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin index d75c4c4..45b7748 100755 Binary files a/Gem/Gem.pd_darwin and b/Gem/Gem.pd_darwin differ diff --git a/Gem/develop/include/Gem/Utils/nop.h b/Gem/develop/include/Gem/Utils/nop.h index 8431ef2..75875ef 100644 --- a/Gem/develop/include/Gem/Utils/nop.h +++ b/Gem/develop/include/Gem/Utils/nop.h @@ -15,10 +15,11 @@ LOG #ifndef _INCLUDE__GEM_UTILS_NOP_H_ #define _INCLUDE__GEM_UTILS_NOP_H_ -#if __STDC_VERSION__ >= 199901L -# define nop(...) +#if __cplusplus > 199711L || __STDC_VERSION__ >= 199901L +# define nop(...) do {} while (0) #else -# define nop +static inline void gem__nop(...) { ; } +# define nop gem__nop #endif static inline void gem__nop_post(void) { ; } diff --git a/Gem/gem_filmAVFoundation.la b/Gem/gem_filmAVFoundation.la index f02dc44..efb615f 100755 --- a/Gem/gem_filmAVFoundation.la +++ b/Gem/gem_filmAVFoundation.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_filmAVFoundation.so b/Gem/gem_filmAVFoundation.so index 585ee94..6abd155 100755 Binary files a/Gem/gem_filmAVFoundation.so and b/Gem/gem_filmAVFoundation.so differ diff --git a/Gem/gem_imageJPEG.la b/Gem/gem_imageJPEG.la index 79b0ea1..87674c9 100755 --- a/Gem/gem_imageJPEG.la +++ b/Gem/gem_imageJPEG.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ljpeg -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ljpeg -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index 52bd346..e27c5a9 100755 Binary files a/Gem/gem_imageJPEG.so and b/Gem/gem_imageJPEG.so differ diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la index 1d88c89..e66d5c5 100755 --- a/Gem/gem_imageMAGICK.la +++ b/Gem/gem_imageMAGICK.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/7.0.7-14/lib /usr/local/Cellar/imagemagick/7.0.7-14/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.3/lib -lfreetype -llzma -lbz2 -lltdl -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/7.0.7-14/lib /usr/local/Cellar/imagemagick/7.0.7-14/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.3/lib -lfreetype -llzma -lbz2 -lltdl -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so index d214f47..3d8be23 100755 Binary files a/Gem/gem_imageMAGICK.so and b/Gem/gem_imageMAGICK.so differ diff --git a/Gem/gem_imageSGI.la b/Gem/gem_imageSGI.la index b791168..b37a1e5 100755 --- a/Gem/gem_imageSGI.la +++ b/Gem/gem_imageSGI.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so index ef27c1c..ed6d145 100755 Binary files a/Gem/gem_imageSGI.so and b/Gem/gem_imageSGI.so differ diff --git a/Gem/gem_imageTIFF.la b/Gem/gem_imageTIFF.la index fc431e3..ce13e72 100755 --- a/Gem/gem_imageTIFF.la +++ b/Gem/gem_imageTIFF.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ltiff -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ltiff -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so index e9c41b9..e896629 100755 Binary files a/Gem/gem_imageTIFF.so and b/Gem/gem_imageTIFF.so differ diff --git a/Gem/gem_modelOBJ.la b/Gem/gem_modelOBJ.la index c729dd5..01d73cc 100755 --- a/Gem/gem_modelOBJ.la +++ b/Gem/gem_modelOBJ.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so index 75f0bbe..87aef6f 100755 Binary files a/Gem/gem_modelOBJ.so and b/Gem/gem_modelOBJ.so differ diff --git a/Gem/gemcocoawindow.la b/Gem/gemcocoawindow.la index aa01034..03ce7e9 100755 --- a/Gem/gemcocoawindow.la +++ b/Gem/gemcocoawindow.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -framework Cocoa' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin index 534b5e8..7f3a55e 100755 Binary files a/Gem/gemcocoawindow.pd_darwin and b/Gem/gemcocoawindow.pd_darwin differ diff --git a/Gem/gemglfw3window.la b/Gem/gemglfw3window.la index aee9ef5..aaf4065 100755 --- a/Gem/gemglfw3window.la +++ b/Gem/gemglfw3window.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/glfw/3.2.1/lib -lglfw -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/glfw/3.2.1/lib -lglfw -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gemglfw3window.pd_darwin b/Gem/gemglfw3window.pd_darwin index e61f4c9..59c5e9e 100755 Binary files a/Gem/gemglfw3window.pd_darwin and b/Gem/gemglfw3window.pd_darwin differ diff --git a/Gem/gemglutwindow.la b/Gem/gemglutwindow.la index 9397b73..dc58178 100755 --- a/Gem/gemglutwindow.la +++ b/Gem/gemglutwindow.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -framework GLUT' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin index 811b456..abacf07 100755 Binary files a/Gem/gemglutwindow.pd_darwin and b/Gem/gemglutwindow.pd_darwin differ diff --git a/Gem/gemsdlwindow.la b/Gem/gemsdlwindow.la index 8ff4c70..7e1e631 100755 --- a/Gem/gemsdlwindow.la +++ b/Gem/gemsdlwindow.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/lib -lSDLmain -lSDL -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -L/usr/local/lib -lSDLmain -lSDL -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin index 5e97d3f..046b665 100755 Binary files a/Gem/gemsdlwindow.pd_darwin and b/Gem/gemsdlwindow.pd_darwin differ diff --git a/Gem/pix_drum.la b/Gem/pix_drum.la index 915e541..0aa96cb 100755 --- a/Gem/pix_drum.la +++ b/Gem/pix_drum.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin index ba44539..681c9a0 100755 Binary files a/Gem/pix_drum.pd_darwin and b/Gem/pix_drum.pd_darwin differ diff --git a/Gem/pix_fiducialtrack.la b/Gem/pix_fiducialtrack.la index 11d949f..305a88e 100755 --- a/Gem/pix_fiducialtrack.la +++ b/Gem/pix_fiducialtrack.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin index c3498d4..606be26 100755 Binary files a/Gem/pix_fiducialtrack.pd_darwin and b/Gem/pix_fiducialtrack.pd_darwin differ diff --git a/Gem/pix_hit.la b/Gem/pix_hit.la index 6ff5a9c..50a18af 100755 --- a/Gem/pix_hit.la +++ b/Gem/pix_hit.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin index 9347d3e..01c9cd8 100755 Binary files a/Gem/pix_hit.pd_darwin and b/Gem/pix_hit.pd_darwin differ diff --git a/Gem/pix_mano.la b/Gem/pix_mano.la index e4083a1..ec80669 100755 --- a/Gem/pix_mano.la +++ b/Gem/pix_mano.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources//bin -L../.. -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin index 8964df1..b2d4d97 100755 Binary files a/Gem/pix_mano.pd_darwin and b/Gem/pix_mano.pd_darwin differ -- cgit v1.2.1