← Back to branch summary

~ubuntu-branches/ubuntu/trusty/psychtoolbox-3/trusty-proposed

« back to all changes in this revision

Viewing changes to PsychSourceGL/Source/Common/Base/PsychVersioning.h

  • Committer: Package Import Robot
  • Author(s): Yaroslav Halchenko
  • Date: 2013-11-19 23:34:50 UTC
  • mfrom: (3.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20131119233450-f7nf92vb8qavjmk8
Tags: 3.0.11.20131017.dfsg1-3
Upload to unsable since fresh glew has arrived to sid!

Show diffs side-by-side

added added

removed removed

Lines of Context:
PsychSourceGL/Source/Common/Base/PsychVersioning.h
31
31
//these are all constants defined only for reporting versioning.  They are returned by Module('Version')
32
32
#define PSYCHTOOLBOX_MAJOR_VERSION                              3
33
33
#define PSYCHTOOLBOX_MINOR_VERSION                              0
34
 
#define PSYCHTOOLBOX_POINT_VERSION                              9
 
34
#define PSYCHTOOLBOX_POINT_VERSION                              11
35
35
//If you fork my source please change this name.  - awi 
36
36
#define PSYCHTOOLBOX_PROJECT_NAME                               "OpenGL Psychtoolbox"
37
37
#if PSYCH_SYSTEM == PSYCH_OSX
44
44
#endif
45
45
#if PSYCH_SYSTEM == PSYCH_LINUX
46
46
//Placeholder for the GNU/Linux version at build time.
 
47
#ifdef PTB_USE_WAFFLE
 
48
#define PSYCHTOOLBOX_OS_NAME                                    "GNU/Linux WAFFLE"
 
49
#else
47
50
#define PSYCHTOOLBOX_OS_NAME                                    "GNU/Linux X11"
48
51
#endif
 
52
#endif
 
53
 
 
54
#if defined(__LP64__) || defined(_WIN64)
 
55
#define PTB_ARCHITECTURE " 64-Bit"
 
56
#else
 
57
#define PTB_ARCHITECTURE " 32-Bit"
 
58
#endif
49
59
 
50
60
#if PSYCH_LANGUAGE == PSYCH_MATLAB
51
61
#ifndef PTBOCTAVE3MEX
52
62
//Placeholder for the MATLAB version at build time.
53
 
#define PSYCHTOOLBOX_SCRIPTING_LANGUAGE_NAME                    "Matlab"
 
63
#define PSYCHTOOLBOX_SCRIPTING_LANGUAGE_NAME                    "Matlab" PTB_ARCHITECTURE
54
64
#else
55
65
// Binary plugin for Octave-3 or later via the MEX interface:
56
 
#define PSYCHTOOLBOX_SCRIPTING_LANGUAGE_NAME                    "GNU/Octave-3"
 
66
#define PSYCHTOOLBOX_SCRIPTING_LANGUAGE_NAME                    "GNU/Octave-3" PTB_ARCHITECTURE
57
67
#endif
58
68
#endif
59
69
 
60
70
#if PSYCH_LANGUAGE == PSYCH_OCTAVE
61
71
//Placeholder for the Octave version at build time.
62
 
#define PSYCHTOOLBOX_SCRIPTING_LANGUAGE_NAME                    "GNU/Octave"
 
72
#define PSYCHTOOLBOX_SCRIPTING_LANGUAGE_NAME                    "GNU/Octave" PTB_ARCHITECTURE
63
73
#endif
64
74
        
65
75
char *PsychGetBuildDate(void);