projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change some initializer use that some compilers choke on (even that technically may...
[freeglut]
/
src
/
fg_internal.h
diff --git
a/src/fg_internal.h
b/src/fg_internal.h
index
4792ad8
..
8c0be9b
100644
(file)
--- a/
src/fg_internal.h
+++ b/
src/fg_internal.h
@@
-32,6
+32,8
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include "fg_version.h"
+
/* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */
/* XXX: Don't all MS-Windows compilers (except Cygwin) have _WIN32 defined?
* XXX: If so, remove the first set of defined()'s below.
/* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */
/* XXX: Don't all MS-Windows compilers (except Cygwin) have _WIN32 defined?
* XXX: If so, remove the first set of defined()'s below.
@@
-45,7
+47,7
@@
#elif defined (__ANDROID__)
# define TARGET_HOST_ANDROID 1
#elif defined (__ANDROID__)
# define TARGET_HOST_ANDROID 1
-#elif defined (__QNX__)
+#elif defined (__QNXNTO__) || defined (__PLAYBOOK__)
# define TARGET_HOST_BLACKBERRY 1
#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)
# define TARGET_HOST_BLACKBERRY 1
#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)
@@
-71,6
+73,14
@@
# define TARGET_HOST_MS_WINDOWS 0
#endif
# define TARGET_HOST_MS_WINDOWS 0
#endif
+#ifndef TARGET_HOST_ANDROID
+# define TARGET_HOST_ANDROID 0
+#endif
+
+#ifndef TARGET_HOST_BLACKBERRY
+# define TARGET_HOST_BLACKBERRY 0
+#endif
+
#ifndef TARGET_HOST_POSIX_X11
# define TARGET_HOST_POSIX_X11 0
#endif
#ifndef TARGET_HOST_POSIX_X11
# define TARGET_HOST_POSIX_X11 0
#endif
@@
-332,6
+342,8
@@
struct tagSFG_State
GLboolean SkipStaleMotion; /* skip stale motion events */
GLboolean SkipStaleMotion; /* skip stale motion events */
+ GLboolean StrokeFontDrawJoinDots;/* Draw dots between line segments of stroke fonts? */
+
int MajorVersion; /* Major OpenGL context version */
int MinorVersion; /* Minor OpenGL context version */
int ContextFlags; /* OpenGL context flags */
int MajorVersion; /* Major OpenGL context version */
int MinorVersion; /* Minor OpenGL context version */
int ContextFlags; /* OpenGL context flags */