Commit Graph

1760 Commits

Author SHA1 Message Date
jtsiomb
db2ea877b0 - changed the main INCLUDE_DIRECTORIES definition to place the main header
locations first in the list instead of appending them. This gives priority to
  our freeglut*.h files instead of the old system-wide installed ones.
- removed the Xxf86vm hack from CMakeLists.txt: it seems like it's not needed
  any more in new versions of cmake, and it fails to link on MacOSX.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1745 7f0cb862-5218-0410-a997-914c9d46530a
2015-02-18 04:59:57 +00:00
jtsiomb
8c295f0617 added INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) to make sure X11 header files are correctly located, on systems where they are in weird places.
This closes bug: #218


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1744 7f0cb862-5218-0410-a997-914c9d46530a
2015-02-18 03:59:21 +00:00
jtsiomb
7229171bf4 Applied Daniel Macks' patch to use ${CMAKE_INSTALL_LIBDIR} instead of
hardcoding lib for the installation directory of libraries, with the
additional modification of installing the pkg-config files there too.
closing bug #217


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1743 7f0cb862-5218-0410-a997-914c9d46530a
2015-02-18 00:37:05 +00:00
jtsiomb
3d4b5a78a9 pkgconfig files should go to $(PREFIX)/lib, not $(PREFIX)/share. Closing bug #216
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1742 7f0cb862-5218-0410-a997-914c9d46530a
2015-01-03 11:55:09 +00:00
dcnieho
9f44b39ca0 add todo: don't deinitialize option
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1741 7f0cb862-5218-0410-a997-914c9d46530a
2015-01-02 16:39:56 +00:00
dcnieho
0fb590f83a todo: handling user typing non-western script
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1740 7f0cb862-5218-0410-a997-914c9d46530a
2015-01-02 16:39:41 +00:00
dcnieho
96f344f263 high DPI awareness todo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1739 7f0cb862-5218-0410-a997-914c9d46530a
2015-01-02 16:39:27 +00:00
dcnieho
5b152532af more todo updating
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1738 7f0cb862-5218-0410-a997-914c9d46530a
2015-01-02 16:39:13 +00:00
dcnieho
4675a5039a adding void* callbacks todo to website feature planning page
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1737 7f0cb862-5218-0410-a997-914c9d46530a
2015-01-02 16:08:54 +00:00
jtsiomb
af5f03497e added rc2 to the main page
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1736 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-26 18:14:59 +00:00
dcnieho
4ccfe206f1 updated list of cmake switches in README.cmake
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1734 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-25 14:35:17 +00:00
dcnieho
19edce36b2 CMake: FREEGLUT_REPLACE_GLUT option should not be visible on windows
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1733 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-25 14:35:09 +00:00
jtsiomb
f0f7dc61ab brought back the option to build either as "glut" or "freeglut": FREEGLUT_REPLACE_GLUT
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1732 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-24 21:23:29 +00:00
dcnieho
9e72134ab6 typofixes - https://github.com/vlajos/misspell_fixer
(cherry picked from commit c85ed83b84)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1731 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-22 16:27:02 +00:00
jtsiomb
081efa33c4 include standard UNIX header fcntl.h in fg_joystick_x11.c, since fcntl() is called conditionally in there (bug #192).
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1730 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-02 05:22:12 +00:00
jtsiomb
4fc11e3285 - changed the minor so version for the new release to 3.10.0 (fg2.8.1 was 3.9.0)
- made the so version numbers more prominent in the cmake file to make sure they're not forgotten in future releases


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1729 7f0cb862-5218-0410-a997-914c9d46530a
2014-11-04 11:47:27 +00:00
dcnieho
84695da2d0 Added support for minimizing window.
Fixed issue where reshape callback would be called multiple times due to conflicting window size messages on keyboard closure.
Fixed issue where changing orientation with the keyboard open would cause multiple reshape events.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1728 7f0cb862-5218-0410-a997-914c9d46530a
2014-11-03 04:19:10 +00:00
dcnieho
9089d1c682 Added missing glutStrokeWidthf and glutStrokeLengthf for mobile support.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1727 7f0cb862-5218-0410-a997-914c9d46530a
2014-11-03 04:18:51 +00:00
dcnieho
c9c7ef6b84 announcing 3.0.0 RC1 on website
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1726 7f0cb862-5218-0410-a997-914c9d46530a
2014-11-01 14:14:46 +00:00
jtsiomb
83552a5fdc removed all HAVE_ERRNO checks
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1724 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-20 15:27:04 +00:00
jtsiomb
1186d43a25 removed vfprintf and checking from CMakeLists.txt, and all the fallbacks from
vfprintf to the obscure _doprnt function



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1723 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-20 15:22:29 +00:00
jtsiomb
d778f6fc64 fixed the unreachable GL error check in getAttribOrUniformLocation in demos/shapes/shapes.c as noted by Kevin Morgan
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1722 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-19 23:22:53 +00:00
jtsiomb
b9ee7f2cd4 added missing newlines at the ends of two files as reported by Kevin Morgan.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1721 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-19 23:13:54 +00:00
dcnieho
a069a66084 small simplification
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1720 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-18 16:22:39 +00:00
dcnieho
714b3d2246 documenting glutStrokeWidthf and glutStrokeLengthf
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1719 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-17 16:38:40 +00:00
dcnieho
3b634a941a adding glutStrokeWidthf and glutStrokeLengthf from GLUT 3.8
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1718 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-17 16:28:24 +00:00
dcnieho
9af2382e14 renamed all references to freeglut_xxx files (their old names) to fg_xxx
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1717 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-17 16:09:00 +00:00
dcnieho
3bd2a31b9a be more careful about closing menus when focus changes. Only do so when new focus window is not ANY of the open menus and when it is not the menu's parent window (all open menus are guaranteed to have the same parent in my reading of the code)
Also simplified situation in which menus are SW_SHOWed... if a gamemode window is open, it must the parent of any active windows as there can be no other windows open on top of the gamemode window.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1716 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-16 17:43:22 +00:00
dcnieho
f16d04cfd1 forgot to document GLUT_ACTION_GLUTMAINLOOP_RETURNS when discussing glutLeaveMainLoop in api docs
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1715 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-13 14:17:01 +00:00
dcnieho
adce03d8ab more cleanup: config.h include never needed in demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1714 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-13 13:54:44 +00:00
dcnieho
ee1de6feda Tidy-up: config.h included via fg_internal.h no deep to duplicate.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1713 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-13 13:54:27 +00:00
dcnieho
c23c2e827e some cleanup, correctness in naming, correctness in type (those ATOM should be BOOL)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1712 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 09:50:19 +00:00
dcnieho
977d52522c change some initializer use that some compilers choke on (even that technically may a bug in the compiler, I think)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1711 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 06:37:00 +00:00
dcnieho
2e45756a33 Fixed bug identified by Kevin. If pollrate is larger than elapsedtime, we'd wrap, and joystick would never get polled
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1710 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 06:21:32 +00:00
dcnieho
635ca451cb removed debug code I forgot to clean up
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1709 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 04:49:22 +00:00
jtsiomb
ff3e93d95c fixed a printf format specifier (was %i instead of %lu while printing an unsigned long)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1708 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-11 17:20:19 +00:00
jtsiomb
c1e80f3ddf fixed build on MSVC6
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1707 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-11 17:15:33 +00:00
dcnieho
1d3212b883 progress page on website:
updated discussion of making font rendering GL2+ and GLES 1/2 clean
added unicode support as todo note (its frequently requested)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1706 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-06 16:32:46 +00:00
dcnieho
f1df2e76d1 drawing join dots on stroke fonts is now optional (and default off)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1705 7f0cb862-5218-0410-a997-914c9d46530a
2014-09-28 04:04:08 +00:00
dcnieho
804a62ab58 now using _NET_FRAME_EXTENTS if available to get size of window decorations
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1704 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-29 00:41:03 +00:00
dcnieho
b0288518d1 X11: implemented borderless and captionless window style using motif hints
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1703 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 16:02:03 +00:00
dcnieho
80c07e8b65 note on what GLUT_WINDOW_BORDER_HEIGHT is
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1702 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 13:42:59 +00:00
dcnieho
9141845a49 glutGet window position should be relative to parent
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1701 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 11:45:58 +00:00
dcnieho
b0811138cc caption height should include the width of the border atop the window
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1700 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 10:14:44 +00:00
dcnieho
f57980927a resizer demo:
some breaks missing in keyboard switch
added instruction text for which buttons can be pressed

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1699 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 05:47:05 +00:00
dcnieho
a894e63bdd For builds not using cmake, generate fg_version.h to match cmake-specified version number.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1696 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 02:00:40 +00:00
jtsiomb
2ed4ed5b52 changed the X11 gamemode code policy. Falling back to xf86vm when xrandr fails
was problematic when passing invalid modes. Now instead, if xrandr is
available, we use that, and only that. XF86VM is now only used when XR&R is not
supported at all.

I also added a set of env vars to artificially disable one or the other, or
both. If FREEGLUT_NO_XRANDR is set we completely ignore XR&R, and if
FREEGLUT_NO_XF86VM is set, we completely ignore XF86VidMode. Obviously if both
are defined or missing, game mode can't switch resolutions at all any more, but
that's a nice debugging aid, and may be useful to allow the user to pick which
extension he'd rather use for mode switching.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1695 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 00:52:53 +00:00
dcnieho
c12f6173db Updated BlackBerry references to make note of the change from FREEGLUT_GLES2/1 to FREEGLUT_GLES.
Updated BlackBerry toolchain to support building with Dinkum and to support OS 10.3 and GCC 4.8.2
Updated BlackBerry fg_window_blackberry so that window usages aren't hardcoded based on compile information, since it is now controlled by glutInitContextVersion.
EGL window setup now supports EGL 1.5, Renderable type for ES3, and using the minor version from glutInitContextVersion to have more exact control over which version of OpenGL ES is used (requires EGL 1.5)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1694 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-24 07:03:16 +00:00
dcnieho
89cfab41fc updated api doc
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1693 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-02 13:25:25 +00:00
beuc
c93af8dfea Provide Android binaries for testers
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1692 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 13:55:34 +00:00