John Tsiombikas [Fri, 21 Feb 2020 22:25:31 +0000 (22:25 +0000)]
Work-around for an issue which cropped up with the release of gcc-10. In their
infinite wisdom, they decided to build with -fno-common as default from now on,
breaking every piece of C code which used to declare common symbols in header
files, as was the convention since the dawn of time. We now have to duplicate
all declarations to an arbitrary source file, and change the header-file ones
to prefix them with extern.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1863
7f0cb862-5218-0410-a997-
914c9d46530a
Maya Rashish [Tue, 22 Oct 2019 08:12:59 +0000 (08:12 +0000)]
Omit mention of autoconf update, autoconf is no longer in use
(cherry picked from commit
fbbe1295dd098b58ae9ec83e447c281671f8f938)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1861
7f0cb862-5218-0410-a997-
914c9d46530a
Maya Rashish [Tue, 22 Oct 2019 08:12:44 +0000 (08:12 +0000)]
Use <sys/joystick.h> on netbsd, too.
<machine/joystick.h> is a compatibility header that only includes
<sys/joystick.h>, and wasn't added to newer architectures.
This helps the build on netbsd/aarch64.
(cherry picked from commit
bcfbede38ae8a2ec6933068dfb489e04bc9cc12e)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1860
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 25 Sep 2019 20:43:34 +0000 (20:43 +0000)]
updated version number to prepare for release 3.2.1
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1856
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 25 Sep 2019 10:08:07 +0000 (10:08 +0000)]
Fixed bug #252: menu windows are drawn with immediate mode and the fixed
function pipeline, and therefore we must make sure the context created for them
is not a core profile context. Previously if the user requested a core profile
context, this would apply to menu windows too, and they would appear black.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1855
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Sep 2019 11:58:31 +0000 (11:58 +0000)]
fixed bug #251: freeglut cmake modules installation would disregard
CMAKE_INSTALL_LIBDIR
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1854
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Sep 2019 11:53:32 +0000 (11:53 +0000)]
Fixed failure to install glut.h header file when FREEGLUT_REPLACE_GLUT is
enabled (bug #250)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1853
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Sep 2019 10:45:42 +0000 (10:45 +0000)]
Version bump in cmake, that should have been done for 3.2.0. Changed SO_MINOR
due to introduction of the new ucall entry points
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1852
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 11 Sep 2019 13:24:28 +0000 (13:24 +0000)]
A couple of fixes in fg_joystick_x11.c identified in bug report #249
- The correct way to set the O_NONBLOCK flag, is to OR that flag with existing
flags. Previously we were overriding everything else and setting the flags
value to O_NONBLOCK directly. Unlikely to cause a problem because we probably
don't have any other flags in the newly opened file descriptor, but strictly
spaking it was incorrect.
- If ioctl JSIOCGAXES and JSIOCGBUTTONS could fail, as it stands, it would
clobber the value of joy->num_axes/joy->num_buttons. It can't fail, but maybe
in the future who knows. Let's be safe.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1848
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 14 Aug 2019 10:33:31 +0000 (10:33 +0000)]
Fixed namespace pollution due to a number of global symbols missing an fg prefix
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1846
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 26 Mar 2019 18:55:42 +0000 (18:55 +0000)]
Applied Christian's change to drop unnecessary dependency to X11 libraries we
don't actually use, by asking cmake to link with X11_X11_LIB instead of the
catch-all X11_LIBRARIES.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1845
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 10 Oct 2018 05:23:33 +0000 (05:23 +0000)]
Fixed mousewheel callbacks under X11. (bug #247, github issue #66)
The code had the incorrect assumption that button numbers mapped to the wheel
follow after the last "real" button as returned by the GLUT_NUM_MOUSE_BUTTONS
query, which in turn resolves to a call to XGetPointerMapping. In reality the
X server always sends button presses for 4 and 5 when a wheel is turned down/up
respectively, and the rest of the mouse buttons (if any) follow afterwards.
Also XGetPointerMapping doesn't seem to reliably return the number of actual
buttons, and in any case the wheel "buttons" are certainly included in the
count as they can be remapped.
Since we can't know if buttons after 5 are further wheels or regular buttons
this modification only ever invokes the wheel callback for wheel 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1844
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 29 Sep 2018 06:05:26 +0000 (06:05 +0000)]
fixed spaceball button callback (x11) compatibility with original GLUT: button
numbers should start from 1, not 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1843
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Mon, 2 Apr 2018 03:16:50 +0000 (03:16 +0000)]
- fallback to non-sRGB visuals if the context creation failed (GLX-only)
- added new glutGet query: GLUT_WINDOW_SRGB (untested on windows)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1842
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Tue, 27 Mar 2018 07:41:18 +0000 (07:41 +0000)]
variable wasn't declared before rest of function. Thanks Markus Israelsson and Vinnie
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1841
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 26 Mar 2018 20:32:31 +0000 (20:32 +0000)]
cleaning up mixed tabs and spaces
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1840
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 26 Mar 2018 20:24:31 +0000 (20:24 +0000)]
fix that stereo shutter glasses for nVidia setups did not engage. We lose the ability to have child windows as the WS_POPUP style doesn't play nice with them, but thats a small price to pay as we estimate them to be rare for stereo displays. Thanks Markus Israelsson
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1839
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 24 Mar 2018 08:51:51 +0000 (08:51 +0000)]
Fix build for Android using clang compiler.
(cherry picked from commit
8366af203e4feeac5655d4452c020a2774037ae0)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1838
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 23 Oct 2017 19:01:09 +0000 (19:01 +0000)]
clear window workmask when queuing up window for destruction. All callbacks (except destroy) are removed from the window already anyway. This fixes a problem where a newly created window that is immediately destroyed again causes an error-exit because it is still being inited and at that point it is found that no display callback has been set, which is an error.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1837
7f0cb862-5218-0410-a997-
914c9d46530a
Firsla [Mon, 23 Oct 2017 18:22:43 +0000 (18:22 +0000)]
Little fix'es.
macOS, BlackBerry.
(cherry picked from commit
033e58b75df411f0aab48353dd1838e0b56dd197)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1836
7f0cb862-5218-0410-a997-
914c9d46530a
Thomas Klausner [Mon, 31 Jul 2017 20:49:26 +0000 (20:49 +0000)]
Fix build on NetBSD.
(cherry picked from commit
1236c7644508227b616e97e29e123b34257e36d1)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1835
7f0cb862-5218-0410-a997-
914c9d46530a
Sean Moore [Mon, 31 Jul 2017 20:49:16 +0000 (20:49 +0000)]
Fixed freeglut.pdb install for builds with MSVC compiler and NMake.
The CMake variable "MSVC" indicates that the Visual Studio compiler is
used but when using that compiler and the "NMake Makefiles JOM" build
generator the *.pdb is wasn't output in a "Debug" directory.
(cherry picked from commit
4e6bceed00b2c64a3cfc0bcbf84350f656a4a7c3)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1834
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 21 Jul 2017 15:13:44 +0000 (15:13 +0000)]
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't legal
(cherry picked from commit
13ed05fe8d5a9914300b4a9b8175e5c7636125eb)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1833
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 12 Jul 2017 20:45:07 +0000 (20:45 +0000)]
moved static variables and functions that should not have stuck behind in fg_joystick.c, but should have been in fg_joystick_x11.c
(cherry picked from commit
0d98472817921dc95d070f13bba59b72d792a7b2)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1832
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 12 Jul 2017 20:44:55 +0000 (20:44 +0000)]
adding vs folder to ignores
(cherry picked from commit
3c3337193843422c77a605bcbe0c7c0819973e10)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1831
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 12 Jul 2017 20:44:47 +0000 (20:44 +0000)]
some whitespace cleanup
(cherry picked from commit
2dd5aa4aa1b5c19392f9abd00e0f6893907df205)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1830
7f0cb862-5218-0410-a997-
914c9d46530a
Thomas Klausner [Wed, 12 Jul 2017 20:44:35 +0000 (20:44 +0000)]
Fix build on NetBSD.
(cherry picked from commit
06e1d815cf9abda49b845754ff420734446eb95b)
(cherry picked from commit
c4294ad59093c27159ea6028d33e3c9581df5354)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1829
7f0cb862-5218-0410-a997-
914c9d46530a
Thomas Klausner [Wed, 12 Jul 2017 20:44:28 +0000 (20:44 +0000)]
Do not define HAVE_USBHID_H manually, cmake does it for us.
(cherry picked from commit
78b19bfc9709d5c4175a7866059a42c478272071)
(cherry picked from commit
0b64b227b521cc9e7ec44a6a1d50a1a8700911e4)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1828
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:23:11 +0000 (23:23 +0000)]
Fixed incorrect MESSAGE usage
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1827
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:23:05 +0000 (23:23 +0000)]
CMake produces an error if XInput.h is not found
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1826
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:22:59 +0000 (23:22 +0000)]
Removed "hack" macro set
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1825
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:22:52 +0000 (23:22 +0000)]
Corrected phrasing in docs and unneeded \ in code
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1824
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:22:45 +0000 (23:22 +0000)]
Fixed x11 and Wayland not using INVOKE_WCB
...since INVOKE_WCB handled user data. Now they handle user data.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1823
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:22:39 +0000 (23:22 +0000)]
Added timer_callback sample for user callbacks
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1822
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:22:26 +0000 (23:22 +0000)]
Added "hack" function for glutCreateMenuUcall
Not desired, but potentially needed as with the other "hack" functions
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1821
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:22:19 +0000 (23:22 +0000)]
Moved as many callback setters as possible to macro function generators
Moved macro function generators to fg_callback_macros.h
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1820
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:22:06 +0000 (23:22 +0000)]
Fixed bug where, under c89 mode, callback macros wouldn't work
Under c89 (only applies to GCC-like compilers), the variadic macro version would be used and compilation would fail.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1818
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:59 +0000 (23:21 +0000)]
Removed unneeded line optimization for INVOKE_WCB macro
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1817
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:53 +0000 (23:21 +0000)]
Fixed issue where setting the same callback with different user pointer wouldn't change the user pointer.
Removed extra comment on FETCH_USER_DATA_WCB
Renamed helper callbacks from glutXXXCalback to fghXXXCallback
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1816
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:46 +0000 (23:21 +0000)]
Added compiler feature detection for __VA_ARGS__ and GCC ##__VA_ARGS__
Made macro names more explicit to prevent name conflicts
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1815
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:40 +0000 (23:21 +0000)]
Implemented pre-C99 support for macro expansion for callbacks.
Note: not tested with a pre-C99 compiler as I (the author) don't have any compiler that doesn't C99.
Fixed copyright too.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1814
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:34 +0000 (23:21 +0000)]
Bug fix for GCC compiler usage
Removed old/original GCC implementation of EXPAND_WCB
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1813
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:28 +0000 (23:21 +0000)]
Initial refactoring of callback macros to make sure all compilers are supported
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1812
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:21 +0000 (23:21 +0000)]
More explicit argument list for INVOKE_WCB callbacks
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1811
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:14 +0000 (23:21 +0000)]
Changed EXPAND_WCB so it works with MSVC and GCC
- Required adding an "argument expansion macro" for each callback (hope to remove eventually)
- Fixed MSVC linking error where glutMenuStatusFuncUCall had the incorrect case and should've been glutMenuStatusFuncUcall
- Updated formatting of some freeglut_ext.h functions
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1810
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:21:06 +0000 (23:21 +0000)]
Finished implementing all user-data callbacks (GCC-only for now).
Updated glutCreateMenu, glutIdleFunc, and glutTimerFunc so they handle NULL callback cases.
Removed glutMenuStateFuncUcall (as glutMenuStateFunc is a depreciated function).
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1809
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 30 Jun 2017 23:20:57 +0000 (23:20 +0000)]
Initial work on callbacks with user data parameters.
-glutCreateMenuUcall
-glutTimerFuncUcall
-glutIdleFuncUcall
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1808
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 14 Jun 2017 20:51:20 +0000 (20:51 +0000)]
multi-touch demo: if an index 64 would come in, this would be written in the wrong place in the cursor buffer. Supporting 64 IDs means writing to slots 0--63
(cherry picked from commit
bef94a71b19e92de5ff82b620fbac853bf83a15b)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1806
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 14 Jun 2017 20:51:14 +0000 (20:51 +0000)]
resizer demo: adding a bit more output to console to indicate what is going on upon keypress
(cherry picked from commit
f04be0c4f22d380e3493b81a6781539e3731b431)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1805
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 14 Jun 2017 20:51:09 +0000 (20:51 +0000)]
multi-touch callback had a copy paste error in the draw loop (thanks sorav for reporting)
(cherry picked from commit
a40f9e9c4efdb519cf623cfb1fde5e5c1156da9b)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1804
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Thu, 25 May 2017 06:34:57 +0000 (06:34 +0000)]
In glutMainLoop, the checking of ExecState, and wether it's equal to
GLUT_EXEC_STATE_RUNNING should not have been at the top of the loop, but rather
right after glutMainLoopEvent returns, after it processes a single event. As it
was, we would be sleeping, waiting for further events even if the user just
called glutLeaveMainLoop (which sets ExecState to GLUT_EXEC_STATE_STOP).
Also fixed a couple cases if inconsistent use of tabs/spaces for indentation
which was causing gcc to emit bogus warnings about misleading indentation
around braceless ifs.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1803
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Sun, 14 May 2017 20:49:46 +0000 (20:49 +0000)]
Ensure "maximixed" is taken into account when updating window visibility on WM_SIZE
(cherry picked from commit
5b8a164de14fe3de4c67b8348c10e2711f481cd5)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1800
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 26 Apr 2017 08:45:32 +0000 (08:45 +0000)]
CMake: include/GL/glut.h should only be installed when FREEGLUT_REPLACE_GLUT is ON
(cherry picked from commit
a0b77bba49573dab3564ce22a503024098664f04)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1798
7f0cb862-5218-0410-a997-
914c9d46530a
Boris Pek [Sat, 22 Apr 2017 20:05:12 +0000 (20:05 +0000)]
Fixed indentation characters in CMakeLists.txt
(cherry picked from commit
c1efb69d4e984fe751840f6446317aca8b458705)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1795
7f0cb862-5218-0410-a997-
914c9d46530a
Boris Pek [Sat, 22 Apr 2017 20:05:06 +0000 (20:05 +0000)]
Fixed Cflags variable in pkgconfig file.
(cherry picked from commit
bc5471a2f8c9c0c7bcb5b767ee788e2b45ec33e9)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1794
7f0cb862-5218-0410-a997-
914c9d46530a
Boris Pek [Sat, 22 Apr 2017 20:05:01 +0000 (20:05 +0000)]
Added FREEGLUT_REPLACE_GLUT configure option for MS Windows.
It provides back compatibility with older (autotools based) freeglut versions.
Also it simplifies build rules for crossplatform programs: they may be linked
with -lglut regardless of the system and library type (shared/static).
Patch is originally prepared for MXE project (http://mxe.cc/).
(cherry picked from commit
cd9ac605ec4615569121e0e9b6bc058684bebfe3)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1793
7f0cb862-5218-0410-a997-
914c9d46530a
Nigel Stewart [Sun, 21 Feb 2016 20:40:10 +0000 (20:40 +0000)]
XParseGeometry will always be needed for Windows, no need for cmake to figure this out.
(cherry picked from commit
55e4430113b528ce40447a96f87cb206cdd39e39)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1792
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Wed, 20 Jan 2016 19:48:49 +0000 (19:48 +0000)]
bug fix
(cherry picked from commit
9dfba8b7de677ee4deaeb1b64d4a426ca7a24260)
(cherry picked from commit
9dfba8b7de677ee4deaeb1b64d4a426ca7a24260)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1789
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Wed, 20 Jan 2016 19:48:39 +0000 (19:48 +0000)]
moved spaceball macros from freeglut_std.h to freeglut_ext.h
(cherry picked from commit
13e6cf15916b12166fb98aaac6f3360c2e044f01)
(cherry picked from commit
13e6cf15916b12166fb98aaac6f3360c2e044f01)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1788
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Wed, 20 Jan 2016 19:48:25 +0000 (19:48 +0000)]
Added API macros for additional Spaceball buttons.
(cherry picked from commit
1a24699b9a502be238d813e97449214b6acdc863)
(cherry picked from commit
1a24699b9a502be238d813e97449214b6acdc863)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1786
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Wed, 20 Jan 2016 19:48:11 +0000 (19:48 +0000)]
Added API macros for Spaceball buttons.
(cherry picked from commit
472bc2bf627cd9a607ac6d59c8e6cb36e72e3aaf)
(cherry picked from commit
472bc2bf627cd9a607ac6d59c8e6cb36e72e3aaf)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1784
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Wed, 20 Jan 2016 19:48:04 +0000 (19:48 +0000)]
update comments of WCB_SpaceXXX in fg_internal.h
(cherry picked from commit
1091f89cf64d255a1fae5c331e556ec52dd6aa3c)
(cherry picked from commit
1091f89cf64d255a1fae5c331e556ec52dd6aa3c)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1783
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 17 Jan 2016 23:53:11 +0000 (23:53 +0000)]
fixed up wrong comment
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1782
7f0cb862-5218-0410-a997-
914c9d46530a
Ray Donnelly [Tue, 12 Jan 2016 21:09:00 +0000 (21:09 +0000)]
Emit the correct LIBNAME to .pc files
Irrespective of "FREEGLUT_REPLACE_GLUT" being set to "No" or being on
Win32 where this variable does not even exist, the .pc file contained
Libs: -L${libdir} -lglut
Instead, emit the correct value.
(cherry picked from commit
d06589f55c87370d388dec333f4bff35c29762f3)
(cherry picked from commit
d06589f55c87370d388dec333f4bff35c29762f3)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1781
7f0cb862-5218-0410-a997-
914c9d46530a
Manuel Bachmann [Mon, 14 Dec 2015 16:22:51 +0000 (16:22 +0000)]
Mention Wayland build requirements in documentation
Following https://github.com/dcnieho/FreeGLUT/issues/38 ;
mention Wayland support in README, Wayland build
instructions and requirements in README.cmake.
Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
(cherry picked from commit
18773bcc818714436e3aeb6229b2f84125d6edc4)
(cherry picked from commit
18773bcc818714436e3aeb6229b2f84125d6edc4)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1780
7f0cb862-5218-0410-a997-
914c9d46530a
John Archdeacon [Mon, 14 Dec 2015 16:22:44 +0000 (16:22 +0000)]
Fixed C2275 compiler error in fg_spaceball_mswin.c
- Known to only affect Visual Studio 2010. Visual Studio 2013 and up may have relaxed the error.
(cherry picked from commit
6b8552edbd715eb77921038c85dda46f90038154)
(cherry picked from commit
6b8552edbd715eb77921038c85dda46f90038154)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1779
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Mon, 14 Dec 2015 16:22:25 +0000 (16:22 +0000)]
Defined logic for glutCreateSubWindow when negative position is allowed
Added check for if fgCreateWindow cannot allocate a window, it will produce an error.
(cherry picked from commit
0ed05f64589fbcc67f225e1dc3ef6f5181fd319f)
(cherry picked from commit
0ed05f64589fbcc67f225e1dc3ef6f5181fd319f)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1776
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Mon, 14 Dec 2015 16:22:18 +0000 (16:22 +0000)]
Added GLUT_ALLOW_NEGATIVE_WINDOW_POSITION so windows can be created with negative position coordinates.
(cherry picked from commit
e7f38b763fec763b3887a0dc29d04e9576d18e78)
(cherry picked from commit
e7f38b763fec763b3887a0dc29d04e9576d18e78)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1775
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 20 Oct 2015 04:35:28 +0000 (04:35 +0000)]
minor C89 conformity fixes in fg_window_egl.c
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1774
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Sat, 17 Oct 2015 11:15:29 +0000 (11:15 +0000)]
Removed invalid PDB install
(cherry picked from commit
23a12a465b6642b996b47dd3fe025abbafbb19e6)
(cherry picked from commit
23a12a465b6642b996b47dd3fe025abbafbb19e6)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1773
7f0cb862-5218-0410-a997-
914c9d46530a
Johannes Zarl-Zierl [Mon, 12 Oct 2015 09:08:37 +0000 (09:08 +0000)]
Export relevant static compile flags on windows.
Use target_compile_definitions to populate the
INTERFACE_COMPILE_DEFINITIONS property on the freeglut_static target on
windows.
(cherry picked from commit
ffc24cfb7607739e49cd2730e44301ef4f3072ae)
(cherry picked from commit
ffc24cfb7607739e49cd2730e44301ef4f3072ae)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1772
7f0cb862-5218-0410-a997-
914c9d46530a
Johannes Zarl [Sat, 11 Jul 2015 21:27:03 +0000 (21:27 +0000)]
Set public definitions in cmake package.
As with pkg-config, the cmake package now sets "-DFREEGLUT_GLES" when
appropriate.
(cherry picked from commit
792d805542a9a96053e1fb3e49f9518ee462d9b0)
(cherry picked from commit
792d805542a9a96053e1fb3e49f9518ee462d9b0)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1771
7f0cb862-5218-0410-a997-
914c9d46530a
Johannes Zarl [Sat, 11 Jul 2015 21:26:56 +0000 (21:26 +0000)]
Create cmake package using imported targets.
Create and install the necessary files so that cmake can find FreeGLUT
in config mode ("find_package(FreeGLUT CONFIG)").
This pushes cmake_minimum_required to 3.0.0.
(cherry picked from commit
ba7326ce8db20dd52785ef1a08da06d8341fc4c1)
(cherry picked from commit
ba7326ce8db20dd52785ef1a08da06d8341fc4c1)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1770
7f0cb862-5218-0410-a997-
914c9d46530a
Johannes Zarl [Sat, 11 Jul 2015 21:26:48 +0000 (21:26 +0000)]
Fix compilation on Linux.
Commit
ce15044f7362943aee7d465bf20310ba02991dae introduced an error
"undefined reference to `sball_initialized'" on non-Windows operating
systems.
(cherry picked from commit
989ceddc191419daa02b08f664bbbce11cbc5598)
(cherry picked from commit
989ceddc191419daa02b08f664bbbce11cbc5598)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1769
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:48 +0000 (10:09 +0000)]
minor fix on CMakeLists for checking MSVC_VERSION
(cherry picked from commit
ce15044f7362943aee7d465bf20310ba02991dae)
(cherry picked from commit
ce15044f7362943aee7d465bf20310ba02991dae)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1767
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:42 +0000 (10:09 +0000)]
update CMake file so that it will generate proper _WIN32_WINNT and WINVER definitions in visual studio project setting.
(cherry picked from commit
96e89316b6de6502522f1527b0e132e731af175a)
(cherry picked from commit
96e89316b6de6502522f1527b0e132e731af175a)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1766
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:33 +0000 (10:09 +0000)]
fixed unsafe usage of malloc() pointed out by jtsiomb.
(cherry picked from commit
16bc9077353d8c08e5214ec09288ec03f53aed97)
(cherry picked from commit
16bc9077353d8c08e5214ec09288ec03f53aed97)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1765
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:27 +0000 (10:09 +0000)]
fixed unsafe usage of malloc() pointed out by jtsiomb.
(cherry picked from commit
aa5514903def8bcc8ceac2487f629b766d23094d)
(cherry picked from commit
aa5514903def8bcc8ceac2487f629b766d23094d)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1764
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:20 +0000 (10:09 +0000)]
Minor fix on indentation.
(cherry picked from commit
c93cdcdbbd8e3611ad3e8a0ca32bba9be2ff0c2c)
(cherry picked from commit
c93cdcdbbd8e3611ad3e8a0ca32bba9be2ff0c2c)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1763
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:13 +0000 (10:09 +0000)]
Minor fix on indentation.
(cherry picked from commit
bfe1b60a499ab12e648d9d68c8012b35fa5eec11)
(cherry picked from commit
bfe1b60a499ab12e648d9d68c8012b35fa5eec11)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1762
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:06 +0000 (10:09 +0000)]
minor update making code more compact.
(cherry picked from commit
09f401761814677e37e750aeecb9ffee450bd989)
(cherry picked from commit
09f401761814677e37e750aeecb9ffee450bd989)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1761
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:09:00 +0000 (10:09 +0000)]
Added support for 3Dconnexion Space Navigator.
(cherry picked from commit
5c1e897f1a843963f5f8e49314ce06424a2525b3)
(cherry picked from commit
5c1e897f1a843963f5f8e49314ce06424a2525b3)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1760
7f0cb862-5218-0410-a997-
914c9d46530a
Jinrong Xie [Mon, 29 Jun 2015 10:08:53 +0000 (10:08 +0000)]
Added support for 3Dconnexion Space Navigator.
(cherry picked from commit
857105a0b4a4c44fcdd9b11a33eff0c910ce41a9)
(cherry picked from commit
857105a0b4a4c44fcdd9b11a33eff0c910ce41a9)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1759
7f0cb862-5218-0410-a997-
914c9d46530a
Manuel Bachmann [Sat, 4 Apr 2015 18:43:27 +0000 (18:43 +0000)]
Implement initial Wayland support
This commit creates a new "wayland" backend, which can be
activated at configure time with "-DFREEGLUT_WAYLAND=ON".
If done so, it will be used instead of X11 (building both
and doing runtime detection may become possible later).
Please note that if you choose to use GL instead of GLES
(by not specifying "-DFREEGLUT_GLES=ON"), then libX11
will still be pulled as an indirect dependency.
Following features are still WIP :
- menus (not implemented, TODO) ;
- client-side decorations (not implemented, required
because Wayland shells do not draw title bars nor
resize grips, TODO) ;
- game mode (code is commented out, depends on WIP
protocols tested upstream, WAIT FOR UPSTREAM) ;
- window visibility states (code is commented out,
depends on xdg-shell protocol, TODO).
Signed-off-by: Manuel Bachmann <tarnyko@tarnyko.net>
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1758
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 7 Mar 2015 20:57:16 +0000 (20:57 +0000)]
updated the readme file, and removed out of date and unmaintained files from the project root
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1752
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 7 Mar 2015 18:55:40 +0000 (18:55 +0000)]
fixed indentation in AUTHORS
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1751
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 7 Mar 2015 18:53:54 +0000 (18:53 +0000)]
added the init error handler example program contributed by Chris Marshall
Not building it as part of the demos yet, since it was submitted quite late in the 3.0 release process
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1750
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 28 Feb 2015 04:15:13 +0000 (04:15 +0000)]
- fixed a minor bug in the UNIX/X11 cursor code, causing an X error and abort
due to a stale cursor cache, when the application (which calls glutSetCursor),
uses glutLeaveMainLoop to close the connection to the X server, and then
re-initializes freeglut and starts over with a new connection.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1749
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Feb 2015 05:20:50 +0000 (05:20 +0000)]
removed the completely outdated FrequentlyAskedQuestions file
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1747
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Feb 2015 05:03:16 +0000 (05:03 +0000)]
MacOSX doesn't define HOST_NAME_MAX in unistd.h, which made freeglut fail to
build. Now, if the definition is missing, we'll just define it arbitrarilly as
255, which should be a safe value. This is just needed for an obscure X11 WM
protocol.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1746
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Feb 2015 04:59:57 +0000 (04:59 +0000)]
- 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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1745
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Feb 2015 03:59:21 +0000 (03:59 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1744
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 18 Feb 2015 00:37:05 +0000 (00:37 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1743
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 3 Jan 2015 11:55:09 +0000 (11:55 +0000)]
pkgconfig files should go to $(PREFIX)/lib, not $(PREFIX)/share. Closing bug #216
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1742
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 25 Dec 2014 14:35:17 +0000 (14:35 +0000)]
updated list of cmake switches in README.cmake
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1734
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 25 Dec 2014 14:35:09 +0000 (14:35 +0000)]
CMake: FREEGLUT_REPLACE_GLUT option should not be visible on windows
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1733
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 24 Dec 2014 21:23:29 +0000 (21:23 +0000)]
brought back the option to build either as "glut" or "freeglut": FREEGLUT_REPLACE_GLUT
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1732
7f0cb862-5218-0410-a997-
914c9d46530a
Veres Lajos [Mon, 22 Dec 2014 16:27:02 +0000 (16:27 +0000)]
typofixes - https://github.com/vlajos/misspell_fixer
(cherry picked from commit
c85ed83b848379d49d0869b84ab15851e2df8784)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1731
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 2 Dec 2014 05:22:12 +0000 (05:22 +0000)]
include standard UNIX header fcntl.h in fg_joystick_x11.c, since fcntl() is called conditionally in there (bug #192).
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1730
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 4 Nov 2014 11:47:27 +0000 (11:47 +0000)]
- 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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1729
7f0cb862-5218-0410-a997-
914c9d46530a