Commit Graph

1944 Commits

Author SHA1 Message Date
Diederick C. Niehorster
2c780f6d4f Merge pull request #56 from rcmaniac25/bugfix/sf233_maximum_iconify_restore
Ensure "maximixed" is taken into account when updating window visibility on WM_SIZE
2017-05-14 22:42:45 +02:00
Rcmaniac25
5b8a164de1 Ensure "maximixed" is taken into account when updating window visibility on WM_SIZE 2017-05-13 01:48:32 -04:00
Diederick C. Niehorster
c02a76e393 Merge remote-tracking branch 'svn/trunk' into git_master 2017-04-26 10:46:11 +02:00
dcnieho
174bd48290 updated text on main website page regarding license of FreeGLUT
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1799 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-26 08:45:38 +00:00
dcnieho
474975bc41 CMake: include/GL/glut.h should only be installed when FREEGLUT_REPLACE_GLUT is ON
(cherry picked from commit a0b77bba49)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1798 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-26 08:45:32 +00:00
dcnieho
585d7bfdee Added templates
(cherry picked from commit a83772981f)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1797 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-26 08:45:26 +00:00
Diederick C. Niehorster
54f397d23b Merge pull request #55 from rcmaniac25/feature/github_templates
Added GitHub templates for issues and PRs
2017-04-26 10:37:00 +02:00
Rcmaniac25
a83772981f Added templates 2017-04-25 21:55:49 -04:00
Diederick C. Niehorster
a0b77bba49 CMake: include/GL/glut.h should only be installed when FREEGLUT_REPLACE_GLUT is ON 2017-04-22 23:00:22 +02:00
Diederick C. Niehorster
8e369de416 Merge remote-tracking branch 'svn/trunk' into git_master 2017-04-22 22:05:42 +02:00
dcnieho
18dffcc4b5 Correct spelling error
(cherry picked from commit fadb3bede9)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1796 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:18 +00:00
dcnieho
a7930a626e Fixed indentation characters in CMakeLists.txt
(cherry picked from commit c1efb69d4e)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1795 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:12 +00:00
dcnieho
2594b6d6c8 Fixed Cflags variable in pkgconfig file.
(cherry picked from commit bc5471a2f8)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1794 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:06 +00:00
dcnieho
c985322fc0 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 cd9ac605ec)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1793 7f0cb862-5218-0410-a997-914c9d46530a
2017-04-22 20:05:01 +00:00
Diederick C. Niehorster
0a695848a9 Merge pull request #48 from tehnick/fixes-from-mxe-project
Added FREEGLUT_REPLACE_GLUT configure option for MS Windows
2017-04-22 22:02:53 +02:00
Diederick C. Niehorster
02035f04cc Merge pull request #49 from rogersachan/patch-1
Correct spelling error
2017-04-22 22:01:40 +02:00
Boris Pek
c1efb69d4e Fixed indentation characters in CMakeLists.txt 2017-02-20 12:53:46 +03:00
Boris Pek
bc5471a2f8 Fixed Cflags variable in pkgconfig file. 2017-02-20 12:53:45 +03:00
Boris Pek
cd9ac605ec 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/).
2017-02-20 12:53:33 +03:00
Roger
fadb3bede9 Correct spelling error 2017-02-12 20:13:45 -05:00
Diederick Niehorster
c59188a9a8 Merge remote-tracking branch 'svn/trunk' into git_master 2016-02-21 21:40:26 +01:00
dcnieho
979c5ce24d XParseGeometry will always be needed for Windows, no need for cmake to figure this out.
(cherry picked from commit 55e4430113)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1792 7f0cb862-5218-0410-a997-914c9d46530a
2016-02-21 20:40:10 +00:00
Diederick C. Niehorster
6f76af2171 Merge pull request #16 from nigels-com/merge-WindowsXParseGeometry
XParseGeometry will always be needed for Windows, no need for cmake to f...
2016-02-21 21:08:44 +01:00
Rcmaniac25
a8621ad942 Moved as many callback setters as possible to macro function generators
Moved macro function generators to fg_callback_macros.h
2016-02-07 15:16:01 -05:00
Rcmaniac25
682d4d096a Updated documentation to mention and discuss user-data callbacks. 2016-02-04 21:14:40 -05:00
Rcmaniac25
666b80843a 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.
2016-01-21 21:15:59 -05:00
Rcmaniac25
363ed17d99 Removed unneeded line optimization for INVOKE_WCB macro 2016-01-21 06:22:03 -05:00
Diederick Niehorster
0d2407012c Merge remote-tracking branch 'svn/trunk' into git_master 2016-01-20 20:49:16 +01:00
dcnieho
3bed0feb38 fixing up some docs regarding spaceball buttons
(cherry picked from commit c9442fa119)

(cherry picked from commit c9442fa119)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1791 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:49:02 +00:00
dcnieho
7e16d00e49 Noted the numerical value for spaceball button macro
(cherry picked from commit 5f6e4fbe68)

(cherry picked from commit 5f6e4fbe68)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1790 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:55 +00:00
dcnieho
6f764746e1 bug fix
(cherry picked from commit 9dfba8b7de)

(cherry picked from commit 9dfba8b7de)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1789 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:49 +00:00
dcnieho
be5e4ec604 moved spaceball macros from freeglut_std.h to freeglut_ext.h
(cherry picked from commit 13e6cf1591)

(cherry picked from commit 13e6cf1591)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1788 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:39 +00:00
dcnieho
8503b82e20 Added API documentation for glutSpaceballXXX functions.
(cherry picked from commit 21cccdf7f3)

(cherry picked from commit 21cccdf7f3)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1787 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:32 +00:00
dcnieho
6dc4eb9dc2 Added API macros for additional Spaceball buttons.
(cherry picked from commit 1a24699b9a)

(cherry picked from commit 1a24699b9a)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1786 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:25 +00:00
dcnieho
2e7a973056 fixed php syntax error, unexpected end of file in template.php: replaced <?php ?> pair with short open tag <? ?>
(cherry picked from commit f4bc97b6d5)

(cherry picked from commit f4bc97b6d5)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1785 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:18 +00:00
dcnieho
09c97585c9 Added API macros for Spaceball buttons.
(cherry picked from commit 472bc2bf62)

(cherry picked from commit 472bc2bf62)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1784 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:11 +00:00
dcnieho
dc4f2d3847 update comments of WCB_SpaceXXX in fg_internal.h
(cherry picked from commit 1091f89cf6)

(cherry picked from commit 1091f89cf6)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1783 7f0cb862-5218-0410-a997-914c9d46530a
2016-01-20 19:48:04 +00:00
Diederick Niehorster
c9442fa119 fixing up some docs regarding spaceball buttons 2016-01-20 20:45:48 +01:00
Diederick C. Niehorster
b9633f0ec9 Merge pull request #45 from stonexjr/Jinrong
Spaceball API documentation and macros updates
2016-01-20 20:38:07 +01:00
Jinrong Xie
5f6e4fbe68 Noted the numerical value for spaceball button macro 2016-01-19 19:03:41 -08:00
Jinrong Xie
9dfba8b7de bug fix 2016-01-18 23:25:47 -08:00
Rcmaniac25
60a437b3b8 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
2016-01-18 22:15:24 -05:00
Jinrong Xie
13e6cf1591 moved spaceball macros from freeglut_std.h to freeglut_ext.h 2016-01-18 17:44:53 -08:00
Jinrong Xie
21cccdf7f3 Added API documentation for glutSpaceballXXX functions. 2016-01-18 15:42:44 -08:00
Jinrong Xie
1a24699b9a Added API macros for additional Spaceball buttons. 2016-01-18 14:46:59 -08:00
Jinrong Xie
f4bc97b6d5 fixed php syntax error, unexpected end of file in template.php: replaced <?php ?> pair with short open tag <? ?> 2016-01-18 13:47:13 -08:00
Jinrong Xie
472bc2bf62 Added API macros for Spaceball buttons. 2016-01-18 12:54:06 -08:00
Jinrong Xie
1091f89cf6 update comments of WCB_SpaceXXX in fg_internal.h 2016-01-18 01:16:58 -08:00
Jinrong Xie
8702fc44ec Merge pull request #1 from dcnieho/git_master
Update from original
2016-01-18 00:00:40 -08:00
Diederick Niehorster
da7d22e896 Merge remote-tracking branch 'svn/trunk' into git_master 2016-01-18 00:55:17 +01:00