Permalink
Browse files

Merge pull request #17 from Psychtoolbox-3/master

"Rotten Apples" V 3.0.10 release.
  • Loading branch information...
kleinerm committed Jun 1, 2012
2 parents 679b5d7 + a82ba99 commit 92809a33c1ce0e4149ffc91ea91ec0674172e81e
@@ -16,17 +16,17 @@ bindir = ${exec_prefix}/bin
libdir = ${exec_prefix}/lib
includedir = ${prefix}/include
CC = gcc
-CFLAGS = -g -O2 -DPA_LITTLE_ENDIAN -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=8 -DHAVE_NANOSLEEP=1 -DPA_USE_COREAUDIO=1 -DPA_ENABLE_DEBUG_OUTPUT=1
+CFLAGS = -g -O2 -DPA_LITTLE_ENDIAN -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=8 -DHAVE_NANOSLEEP=1 -DPA_USE_COREAUDIO=1 -DPA_ENABLE_DEBUG_OUTPUT=1 -mmacosx-version-min=10.5
LIBS = -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
AR = /usr/bin/ar
RANLIB = ranlib
LIBTOOL = $(SHELL) $(top_builddir)/libtool
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
SHARED_FLAGS = -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib
-LDFLAGS =
+LDFLAGS = -mmacosx-version-min=10.5
DLL_LIBS =
-CXXFLAGS = -g -O2
+CXXFLAGS = -g -O2 -mmacosx-version-min=10.5
NASM =
NASMOPT =
LN_S = ln -s
Binary file not shown.
Binary file not shown.
View
@@ -1,5 +1,5 @@
% Psychtoolbox.
-% Version 3.0.10 31 May 2012
+% Version 3.0.10 1 June 2012
%
% The Psychophysics Toolbox is a collection of Matlab functions
% that extend the language to give you exquisite control of your
Binary file not shown.
@@ -21,6 +21,7 @@
% 08/06/03 dhb Handle fgetl returns empty string.
% 08/22/07 dhb This was modified on disk but not commented our uploaded to SVN repository.
% 4/26/12 dhb Squeeze '/' out of field names too.
+% 5/31/12 dhb Squeeze '*' out of field names too.
% Open the file
fid = fopen(filename);
@@ -67,7 +68,7 @@
newField = [];
oldField = theFields{i};
for j = 1:length(oldField)
- if (~isspace(oldField(j)) && oldField(j) ~= '.' && oldField(j) ~= '/')
+ if (~isspace(oldField(j)) && oldField(j) ~= '.' && oldField(j) ~= '/' && oldField(j) ~= '*')
newField = [newField oldField(j)];
end
end
@@ -232,12 +232,14 @@ function PsychtoolboxPostInstallRoutine(isUpdate, flavor)
fprintf('to OS/X versions older than 10.6 "Snow Leopard".\n\n');
fprintf('That means that some functionality will be limited or missing.\n');
fprintf('E.g., video capture, video recording, movie playback and movie writing\n');
- fprintf('will be disabled. High precision framebuffer display modes and some parts of\n');
+ fprintf('will be disabled, unless you manage to find a version of GStreamer compatible\n');
+ fprintf('with OSX 10.5. High precision framebuffer display modes and some parts of\n');
fprintf('OpenGL 3D graphics support will be disabled or limited in performance and functionality.\n');
- fprintf('General graphics performance may be lower and resource consumption may be higher.\n\n');
- fprintf('You can either use a version of 32-Bit Matlab to use the 32-Bit Psychtoolbox\n');
- fprintf('on your system, or a 32-Bit version of GNU/Octave to get better results.\n');
- fprintf('Alternatively update your operating system to at least version 10.6 Snow Leopard or later.\n');
+ fprintf('General graphics performance may be lower and resource consumption may be higher.\n');
+ fprintf('Windowed display mode on multi-display setups may behave slightly odd.\n\n');
+ fprintf('You can either live with these restrictions, or use a version of 32-Bit Matlab or Octave\n');
+ fprintf('together with the 32-Bit OSX Psychtoolbox on your system to get better results.\n');
+ fprintf('Alternatively, update your operating system to at least version 10.6 "Snow Leopard" or later.\n');
fprintf('\n\n\n==== WARNING WARNING WARNING WARNING ====\n\n\n');
fprintf('Press any key on keyboard to continue with setup...\n');
pause;

0 comments on commit 92809a3

Please sign in to comment.