Commit Graph

1859 Commits

Author SHA1 Message Date
Diederick Niehorster
bb46cf19d2 Merge remote-tracking branch 'svn/trunk' into git_master 2015-10-12 11:08:31 +02:00
Diederick C. Niehorster
3ca71acdab Merge pull request #35 from jzarl/fix_cmake_package_usage_requirements
Export relevant static compile flags on windows.
2015-10-12 11:01:22 +02:00
Johannes Zarl-Zierl
ffc24cfb76 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.
2015-10-10 23:31:14 +02:00
dcnieho
9825293425 Set public definitions in cmake package.
As with pkg-config, the cmake package now sets "-DFREEGLUT_GLES" when
appropriate.

(cherry picked from commit 792d805542)

(cherry picked from commit 792d805542)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1771 7f0cb862-5218-0410-a997-914c9d46530a
2015-07-11 21:27:03 +00:00
Diederick Niehorster
d3839cd975 Merge remote-tracking branch 'svn/trunk' into git_master 2015-07-11 23:26:59 +02:00
dcnieho
866f61ae9c 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 ba7326ce8d)

(cherry picked from commit ba7326ce8d)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1770 7f0cb862-5218-0410-a997-914c9d46530a
2015-07-11 21:26:56 +00:00
dcnieho
c751a9179d Fix compilation on Linux.
Commit ce15044f73 introduced an error
"undefined reference to `sball_initialized'" on non-Windows operating
systems.

(cherry picked from commit 989ceddc19)

(cherry picked from commit 989ceddc19)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1769 7f0cb862-5218-0410-a997-914c9d46530a
2015-07-11 21:26:48 +00:00
Diederick C. Niehorster
9f7338ebe5 Merge pull request #32 from jzarl/cmake-package
Cmake package
2015-07-11 23:25:29 +02:00
Diederick C. Niehorster
e55bfc05a7 Merge pull request #31 from jzarl/fix_compile_linux
Fix compilation on Linux.
2015-07-11 23:20:54 +02:00
Johannes Zarl
792d805542 Set public definitions in cmake package.
As with pkg-config, the cmake package now sets "-DFREEGLUT_GLES" when
appropriate.
2015-07-10 22:13:50 +02:00
Johannes Zarl
ba7326ce8d 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.
2015-07-10 22:12:51 +02:00
Johannes Zarl
989ceddc19 Fix compilation on Linux.
Commit ce15044f73 introduced an error
"undefined reference to `sball_initialized'" on non-Windows operating
systems.
2015-07-10 16:31:42 +02:00
Diederick Niehorster
85b23a7130 Merge remote-tracking branch 'svn/trunk' into git_master 2015-06-29 12:24:37 +02:00
dcnieho
5d045f4f15 todo note about Windows 8 touch support
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1768 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:14:05 +00:00
dcnieho
976e05c12f minor fix on CMakeLists for checking MSVC_VERSION
(cherry picked from commit ce15044f73)

(cherry picked from commit ce15044f73)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1767 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:48 +00:00
dcnieho
e595297daf update CMake file so that it will generate proper _WIN32_WINNT and WINVER definitions in visual studio project setting.
(cherry picked from commit 96e89316b6)

(cherry picked from commit 96e89316b6)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1766 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:42 +00:00
dcnieho
5259e6156b fixed unsafe usage of malloc() pointed out by jtsiomb.
(cherry picked from commit 16bc907735)

(cherry picked from commit 16bc907735)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1765 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:33 +00:00
dcnieho
8cafe7e34c fixed unsafe usage of malloc() pointed out by jtsiomb.
(cherry picked from commit aa5514903d)

(cherry picked from commit aa5514903d)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1764 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:27 +00:00
dcnieho
8dfbfaca71 Minor fix on indentation.
(cherry picked from commit c93cdcdbbd)

(cherry picked from commit c93cdcdbbd)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1763 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:20 +00:00
dcnieho
238b0ae02c Minor fix on indentation.
(cherry picked from commit bfe1b60a49)

(cherry picked from commit bfe1b60a49)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1762 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:13 +00:00
dcnieho
949f7b3747 minor update making code more compact.
(cherry picked from commit 09f4017618)

(cherry picked from commit 09f4017618)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1761 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:06 +00:00
dcnieho
b593d219d6 Added support for 3Dconnexion Space Navigator.
(cherry picked from commit 5c1e897f1a)

(cherry picked from commit 5c1e897f1a)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1760 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:09:00 +00:00
dcnieho
c2384ac19e Added support for 3Dconnexion Space Navigator.
(cherry picked from commit 857105a0b4)

(cherry picked from commit 857105a0b4)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1759 7f0cb862-5218-0410-a997-914c9d46530a
2015-06-29 10:08:53 +00:00
Diederick C. Niehorster
2785c2e9c8 Merge pull request #26 from stonexjr/Jinrong
Added support for 3Dconnexion Space Navigator
2015-06-29 12:04:00 +02:00
Jinrong Xie
ce15044f73 minor fix on CMakeLists for checking MSVC_VERSION 2015-05-26 18:50:57 -07:00
Jinrong Xie
96e89316b6 update CMake file so that it will generate proper _WIN32_WINNT and WINVER definitions in visual studio project setting. 2015-05-25 16:30:00 -07:00
Jinrong Xie
16bc907735 fixed unsafe usage of malloc() pointed out by jtsiomb. 2015-05-13 00:53:49 -07:00
Jinrong Xie
aa5514903d fixed unsafe usage of malloc() pointed out by jtsiomb. 2015-05-13 00:42:20 -07:00
Diederick Niehorster
5a6d3b2615 Merge remote-tracking branch 'svn/trunk' into git_master 2015-04-04 20:43:49 +02:00
dcnieho
fbdcae2479 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: https://svn.code.sf.net/p/freeglut/code/trunk@1758 7f0cb862-5218-0410-a997-914c9d46530a
2015-04-04 18:43:27 +00:00
Diederick C. Niehorster
7fbdb4ea1e Merge pull request #30 from Tarnyko/git_master
Implement initial Wayland support
2015-04-04 20:42:13 +02:00
Manuel Bachmann
9b30564b6d 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>
2015-03-31 00:49:11 +02:00
jtsiomb
7634646bc1 added handy upload script which uses rsync to copy all modified files
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1757 7f0cb862-5218-0410-a997-914c9d46530a
2015-03-12 19:53:32 +00:00
jtsiomb
b39d4bb27f fixed HTML mistakes in the front page, and removed the freshmeat link (freshmeat is defunct)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1756 7f0cb862-5218-0410-a997-914c9d46530a
2015-03-12 19:41:54 +00:00
jtsiomb
1db50ce44b minor fix on index.php
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1755 7f0cb862-5218-0410-a997-914c9d46530a
2015-03-12 19:32:49 +00:00
jtsiomb
ab34d382e8 web page update
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1754 7f0cb862-5218-0410-a997-914c9d46530a
2015-03-12 19:26:53 +00:00
jtsiomb
c5a4a56585 updated the readme file, and removed out of date and unmaintained files from the project root
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1752 7f0cb862-5218-0410-a997-914c9d46530a
2015-03-07 20:57:16 +00:00
jtsiomb
c16fc72a2c fixed indentation in AUTHORS
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1751 7f0cb862-5218-0410-a997-914c9d46530a
2015-03-07 18:55:40 +00:00
jtsiomb
c63102d06d 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: https://svn.code.sf.net/p/freeglut/code/trunk@1750 7f0cb862-5218-0410-a997-914c9d46530a
2015-03-07 18:53:54 +00:00
jtsiomb
3f95e542fa - 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: https://svn.code.sf.net/p/freeglut/code/trunk@1749 7f0cb862-5218-0410-a997-914c9d46530a
2015-02-28 04:15:13 +00:00
Diederick Niehorster
27d5d26426 Merge remote-tracking branch 'svn/trunk' into git_master 2015-02-20 08:14:55 +01:00
jtsiomb
3be8dc8380 removed the completely outdated FrequentlyAskedQuestions file
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1747 7f0cb862-5218-0410-a997-914c9d46530a
2015-02-18 05:20:50 +00:00
jtsiomb
310764e238 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: https://svn.code.sf.net/p/freeglut/code/trunk@1746 7f0cb862-5218-0410-a997-914c9d46530a
2015-02-18 05:03:16 +00:00
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