Commit Graph

1815 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
Diederick Niehorster
5600276ada Merge remote-tracking branch 'svn/trunk' into git_master 2015-01-03 00:42:30 +08: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
Diederick Niehorster
bc1c695593 Merge remote-tracking branch 'svn/trunk' into git_master 2015-01-03 00:10:22 +08: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
Jinrong Xie
c93cdcdbbd Minor fix on indentation. 2014-12-25 12:02:26 -08:00
Jinrong Xie
bfe1b60a49 Minor fix on indentation. 2014-12-25 11:36:08 -08:00
Diederick Niehorster
be6d4f0d39 Merge remote-tracking branch 'svn/trunk' into git_master 2014-12-25 22:36:11 +08: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
Diederick Niehorster
a1e180a21a Merge remote-tracking branch 'svn/trunk' into git_master 2014-12-25 08:55:10 +08:00
Jinrong Xie
09f4017618 minor update making code more compact. 2014-12-24 15:17:06 -08: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
Jinrong Xie
5c1e897f1a Added support for 3Dconnexion Space Navigator. 2014-12-24 03:47:10 -08:00
Jinrong Xie
857105a0b4 Added support for 3Dconnexion Space Navigator. 2014-12-24 03:46:49 -08:00
Diederick Niehorster
b1316c651f Merge remote-tracking branch 'svn/trunk' into git_master 2014-12-23 01:08:11 +08: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
Diederick C. Niehorster
c95a80d7e6 Merge pull request #23 from vlajos/typofixes-vlajos-20141204 2014-12-23 00:25:49 +08:00
Veres Lajos
c85ed83b84 typofixes - https://github.com/vlajos/misspell_fixer 2014-12-04 23:00:27 +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
Diederick Niehorster
e3b37e2bcb Merge branch 'trunk' into git_master 2014-11-03 12:18:54 +08: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
Diederick C. Niehorster
40337ad874 Merge pull request #22 from rcmaniac25/git_master
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.
 Fixed issue where glutStrokeWidthf and glutStrokeLengthf were not included with stubs, so it failed to compile with mobile builds.
2014-11-03 12:11:47 +08:00
Rcmaniac25
c70ab1fadb Added missing glutStrokeWidthf and glutStrokeLengthf for mobile support. 2014-11-02 16:33:51 -05:00
Diederick Niehorster
56692979f1 Merge branch 'trunk' into git_master 2014-11-02 10:22:34 +08: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
Diederick Niehorster
cf4f9c09ba Merge remote-tracking branch 'svn/trunk' into git_master 2014-10-26 17:01:13 +08: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
Diederick Niehorster
376a810c05 Merge branch 'trunk' into git_master 2014-10-19 00:23:00 +08: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
Diederick Niehorster
c9c27c8f88 Merge branch 'trunk' into git_master 2014-10-18 00:38:16 +08: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
Diederick Niehorster
3ff4c1e72b Merge branch 'trunk' into git_master 2014-10-17 01:45:59 +08: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
Diederick Niehorster
22511a7757 Merge remote-tracking branch 'svn/trunk' into git_master 2014-10-13 22:18:16 +08: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