Diederick C. Niehorster
4bc7de3645
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-27 09:41:53 +02:00
dcnieho
20e9df4141
variable wasn't declared before rest of function. Thanks Markus Israelsson and Vinnie
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1841 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-27 07:41:18 +00:00
Diederick C. Niehorster
79c2f10235
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-26 22:33:49 +02:00
dcnieho
b8a9827c5b
cleaning up mixed tabs and spaces
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1840 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-26 20:32:31 +00:00
Diederick C. Niehorster
39af18f0e6
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-26 22:24:51 +02:00
dcnieho
a2fef0a9bb
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: https://svn.code.sf.net/p/freeglut/code/trunk@1839 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-26 20:24:31 +00:00
Diederick C. Niehorster
9de8fe42b6
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-24 09:52:12 +01:00
dcnieho
b50503822a
Fix build for Android using clang compiler.
...
(cherry picked from commit 8366af203e
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1838 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-24 08:51:51 +00:00
Diederick C. Niehorster
3499dffc7e
Merge pull request #65 from tehnick/fix-android-clang
...
Fix build for Android using clang compiler.
2018-03-24 09:46:28 +01:00
Boris Pek
8366af203e
Fix build for Android using clang compiler.
2017-12-15 03:29:54 +03:00
Diederick C. Niehorster
cd7f5e9964
Merge remote-tracking branch 'svn/trunk' into git_master
2017-10-23 21:02:09 +02:00
dcnieho
d1adda4783
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: https://svn.code.sf.net/p/freeglut/code/trunk@1837 7f0cb862-5218-0410-a997-914c9d46530a
2017-10-23 19:01:09 +00:00
Diederick C. Niehorster
89cf92a221
Merge remote-tracking branch 'svn/trunk' into git_master
2017-10-23 20:23:32 +02:00
dcnieho
173c394399
Little fix'es.
...
macOS, BlackBerry.
(cherry picked from commit 033e58b75d
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1836 7f0cb862-5218-0410-a997-914c9d46530a
2017-10-23 18:22:43 +00:00
Diederick C. Niehorster
517dbec8a8
Merge pull request #61 from Firsla/patch-1
...
Little fix'es.
2017-10-23 20:20:45 +02:00
Firsla
033e58b75d
Little fix'es.
...
macOS, BlackBerry.
2017-10-13 13:04:13 +03:00
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