Diederick C. Niehorster
a5e7ca9303
Merge remote-tracking branch 'svn/trunk' into git_master
2017-07-31 22:49:49 +02:00
dcnieho
5bcf802a95
Fix build on NetBSD.
...
(cherry picked from commit 1236c76445
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1835 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-31 20:49:26 +00:00
dcnieho
72e830f256
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 4e6bceed00
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1834 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-31 20:49:16 +00:00
Diederick C. Niehorster
c1a3a1e456
Merge pull request #60 from 0-wiz-0/git_master
...
Fix build on NetBSD.
2017-07-31 22:47:32 +02:00
Thomas Klausner
1236c76445
Fix build on NetBSD.
2017-07-30 23:38:33 +02:00
Diederick C. Niehorster
08bb28dece
Merge pull request #59 from titorgalaxy/git_master
...
Fixed freeglut.pdb install for builds with MSVC compiler and NMake.
2017-07-30 10:03:27 +02:00
Sean Moore
4e6bceed00
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.
2017-07-29 03:37:58 -04:00
Diederick C. Niehorster
d27ca503e5
Merge remote-tracking branch 'svn/trunk' into git_master
2017-07-21 17:15:27 +02:00
dcnieho
5442c0abbf
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't legal
...
(cherry picked from commit 13ed05fe8d
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1833 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-21 15:13:44 +00:00
Diederick C. Niehorster
dfdb61f768
Merge pull request #58 from rcmaniac25/bugfix/callback_code_isnt_iso_c_compliant
...
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't legal
2017-07-21 17:12:32 +02:00
Rcmaniac25
13ed05fe8d
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't legal
2017-07-21 01:13:30 -04:00
Diederick C. Niehorster
78bf24e101
Merge remote-tracking branch 'svn/trunk' into git_master
2017-07-12 22:45:46 +02:00
dcnieho
eaabcd6b52
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 0d98472817
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1832 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-12 20:45:07 +00:00
dcnieho
4f5d9c918d
adding vs folder to ignores
...
(cherry picked from commit 3c33371938
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1831 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-12 20:44:55 +00:00
dcnieho
07297565c8
some whitespace cleanup
...
(cherry picked from commit 2dd5aa4aa1
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1830 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-12 20:44:47 +00:00
dcnieho
b39b3a5edf
Fix build on NetBSD.
...
(cherry picked from commit 06e1d815cf9abda49b845754ff420734446eb95b)
(cherry picked from commit c4294ad590
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1829 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-12 20:44:35 +00:00
dcnieho
3e8f42bbff
Do not define HAVE_USBHID_H manually, cmake does it for us.
...
(cherry picked from commit 78b19bfc9709d5c4175a7866059a42c478272071)
(cherry picked from commit 0b64b227b5
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1828 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-12 20:44:28 +00:00
Diederick C. Niehorster
0d98472817
moved static variables and functions that should not have stuck behind in fg_joystick.c, but should have been in fg_joystick_x11.c
2017-07-12 22:43:35 +02:00
Diederick C. Niehorster
3c33371938
adding vs folder to ignores
2017-07-12 22:38:00 +02:00
Diederick C. Niehorster
2dd5aa4aa1
some whitespace cleanup
2017-07-12 22:36:48 +02:00
Thomas Klausner
c4294ad590
Fix build on NetBSD.
...
(cherry picked from commit 06e1d815cf9abda49b845754ff420734446eb95b)
2017-07-12 22:29:31 +02:00
Thomas Klausner
0b64b227b5
Do not define HAVE_USBHID_H manually, cmake does it for us.
...
(cherry picked from commit 78b19bfc9709d5c4175a7866059a42c478272071)
2017-07-12 22:29:31 +02:00
Diederick C. Niehorster
78d820107f
Merge remote-tracking branch 'svn/trunk' into git_master
2017-07-01 01:24:10 +02:00
dcnieho
fbd61be1dd
Fixed incorrect MESSAGE usage
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1827 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:23:11 +00:00
dcnieho
5df98e73df
CMake produces an error if XInput.h is not found
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1826 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:23:05 +00:00
dcnieho
47fb7d5f28
Removed "hack" macro set
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1825 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:59 +00:00
dcnieho
1fec35a406
Corrected phrasing in docs and unneeded \ in code
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1824 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:52 +00:00
dcnieho
cc6830131a
Fixed x11 and Wayland not using INVOKE_WCB
...
...since INVOKE_WCB handled user data. Now they handle user data.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1823 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:45 +00:00
dcnieho
850d80554a
Added timer_callback sample for user callbacks
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1822 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:39 +00:00
dcnieho
deaa5b843a
Added "hack" function for glutCreateMenuUcall
...
Not desired, but potentially needed as with the other "hack" functions
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1821 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:26 +00:00
dcnieho
2646c0c9f8
Moved as many callback setters as possible to macro function generators
...
Moved macro function generators to fg_callback_macros.h
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1820 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:19 +00:00
dcnieho
1925fca030
Updated documentation to mention and discuss user-data callbacks.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1819 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:12 +00:00
dcnieho
9f0eaf1a92
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: https://svn.code.sf.net/p/freeglut/code/trunk@1818 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:22:06 +00:00
dcnieho
8ac335fa7f
Removed unneeded line optimization for INVOKE_WCB macro
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1817 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:59 +00:00
dcnieho
da3e00905e
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: https://svn.code.sf.net/p/freeglut/code/trunk@1816 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:53 +00:00
dcnieho
16d920d56a
Added compiler feature detection for __VA_ARGS__ and GCC ##__VA_ARGS__
...
Made macro names more explicit to prevent name conflicts
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1815 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:46 +00:00
dcnieho
dbbf2e5f08
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: https://svn.code.sf.net/p/freeglut/code/trunk@1814 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:40 +00:00
dcnieho
0209cd1ef5
Bug fix for GCC compiler usage
...
Removed old/original GCC implementation of EXPAND_WCB
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1813 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:34 +00:00
dcnieho
658edf902d
Initial refactoring of callback macros to make sure all compilers are supported
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1812 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:28 +00:00
dcnieho
f0150de08d
More explicit argument list for INVOKE_WCB callbacks
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1811 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:21 +00:00
dcnieho
da0b7b3369
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: https://svn.code.sf.net/p/freeglut/code/trunk@1810 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:14 +00:00
dcnieho
827f593d96
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: https://svn.code.sf.net/p/freeglut/code/trunk@1809 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:21:06 +00:00
dcnieho
3c3e3cd234
Initial work on callbacks with user data parameters.
...
-glutCreateMenuUcall
-glutTimerFuncUcall
-glutIdleFuncUcall
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1808 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-30 23:20:57 +00:00
Diederick C. Niehorster
913c66e35e
Merge pull request #42 from rcmaniac25/feature/usr_callback_support
...
User data callback support
2017-07-01 01:14:41 +02:00
Diederick C. Niehorster
75cd7a2fb4
Merge pull request #57 from rcmaniac25/bugfix/xinput_no_error_on_not_found
...
CMake error on X11 builds if XInput.h is not found
2017-06-15 08:29:21 +02:00
Diederick C. Niehorster
41f34945c8
Merge remote-tracking branch 'svn/trunk' into git_master
2017-06-14 22:53:21 +02:00
dcnieho
1941df93b9
freeglut should be spelled lowercase, fixed up all documentation
...
(cherry picked from commit 16e941b2a2
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1807 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:30 +00:00
dcnieho
75854e0698
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 bef94a71b1
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1806 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:20 +00:00
dcnieho
caa5ffe29a
resizer demo: adding a bit more output to console to indicate what is going on upon keypress
...
(cherry picked from commit f04be0c4f2
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1805 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:14 +00:00
dcnieho
26a9d9ca03
multi-touch callback had a copy paste error in the draw loop (thanks sorav for reporting)
...
(cherry picked from commit a40f9e9c4e
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1804 7f0cb862-5218-0410-a997-914c9d46530a
2017-06-14 20:51:09 +00:00