3D Canvas

Check-in [0181d18fc5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix TK version checks
Timelines: family | ancestors | descendants | both | vc-reform
Files: files | file ages | folders
SHA1: 0181d18fc56e042336e086d1356113053ad86ebc
User & Date: apnadkarni 2017-11-19 09:15:35
Context
2017-12-22
12:17
Integrate new nmake build system shipping with Tcl 8.6.8 Leaf check-in: ff028b4953 user: apnadkarni tags: trunk, magicsplat-1.8.0
2017-11-19
09:15
Fix TK version checks Closed-Leaf check-in: 0181d18fc5 user: apnadkarni tags: vc-reform
06:34
Fix some macro redefinition warnings check-in: 5395703856 user: apnadkarni tags: vc-reform
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/c3d.h.

11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#define __CANVAS3D_H__

#include <tcl.h>
#include <tk.h>
#include <string.h>
#include <stdio.h>

#if (TK_MAJOR_VERSION >= 8 && TK_MINOR_VERSION >= 6)
# ifndef UNICODE
#  define UNICODE
# endif
# ifndef _UNICODE
#  define _UNICODE
# endif
#endif

#ifdef MAC_OSX_TK
# include <OpenGL/gl.h>
# if (TK_MAJOR_VERSION >= 8 && TK_MINOR_VERSION >= 5)
#  define CAN3D_NSOPENGL
#  include <OpenGL/OpenGL.h>
#  include <AppKit/NSOpenGL.h>	/* Use NSOpenGLContext */
#  include <AppKit/NSView.h>	/* Use NSView */
#  include <AppKit/NSOpenGLView.h>	/* Use NSView setWantsBestResolutionOpenGLSurface */
#  include <AppKit/NSEvent.h>	/* Use NSEvent */
#  include <AppKit/NSTouch.h>	/* Use NSTouch */







|










|







11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
#define __CANVAS3D_H__

#include <tcl.h>
#include <tk.h>
#include <string.h>
#include <stdio.h>

#if (TK_MAJOR_VERSION > 8) || (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 6)
# ifndef UNICODE
#  define UNICODE
# endif
# ifndef _UNICODE
#  define _UNICODE
# endif
#endif

#ifdef MAC_OSX_TK
# include <OpenGL/gl.h>
# if (TK_MAJOR_VERSION > 8) || (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5)
#  define CAN3D_NSOPENGL
#  include <OpenGL/OpenGL.h>
#  include <AppKit/NSOpenGL.h>	/* Use NSOpenGLContext */
#  include <AppKit/NSView.h>	/* Use NSView */
#  include <AppKit/NSOpenGLView.h>	/* Use NSView setWantsBestResolutionOpenGLSurface */
#  include <AppKit/NSEvent.h>	/* Use NSEvent */
#  include <AppKit/NSTouch.h>	/* Use NSTouch */