dcnieho
976e05c12f
minor fix on CMakeLists for checking MSVC_VERSION
...
(cherry picked from commit ce15044f7362943aee7d465bf20310ba02991dae)
(cherry picked from commit ce15044f7362943aee7d465bf20310ba02991dae)
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 96e89316b6de6502522f1527b0e132e731af175a)
(cherry picked from commit 96e89316b6de6502522f1527b0e132e731af175a)
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
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
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
dcnieho
19edce36b2
CMake: FREEGLUT_REPLACE_GLUT option should not be visible on windows
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1733 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-25 14:35:09 +00:00
jtsiomb
f0f7dc61ab
brought back the option to build either as "glut" or "freeglut": FREEGLUT_REPLACE_GLUT
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1732 7f0cb862-5218-0410-a997-914c9d46530a
2014-12-24 21:23:29 +00:00
jtsiomb
4fc11e3285
- 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: https://svn.code.sf.net/p/freeglut/code/trunk@1729 7f0cb862-5218-0410-a997-914c9d46530a
2014-11-04 11:47:27 +00:00
dcnieho
84695da2d0
Added support for minimizing window.
...
Fixed issue where reshape callback would be called multiple times due to conflicting window size messages on keyboard closure.
Fixed issue where changing orientation with the keyboard open would cause multiple reshape events.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1728 7f0cb862-5218-0410-a997-914c9d46530a
2014-11-03 04:19:10 +00:00
jtsiomb
1186d43a25
removed vfprintf and checking from CMakeLists.txt, and all the fallbacks from
...
vfprintf to the obscure _doprnt function
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1723 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-20 15:22:29 +00:00
jtsiomb
c1e80f3ddf
fixed build on MSVC6
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1707 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-11 17:15:33 +00:00
dcnieho
a894e63bdd
For builds not using cmake, generate fg_version.h to match cmake-specified version number.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1696 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 02:00:40 +00:00
beuc
25be478938
Unify GLES1 and GLES2 (libraries are compatible and can be co-linked)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1687 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 09:24:47 +00:00
jtsiomb
ff6255810d
Compiling with -ansi makes a lot of important POSIX (standard UNIX) facilities
...
unavailable. This was masked until recently by an incorrect conditional in the
CMakeLists.txt file, that looked like it would use -ansi on anything other than
android, but it didn't actually use it anywhere. As soon as that was fixed, and
-ansi started being used, build broke on linux.
The intention of the -ansi flag was to help catch portability-reducing mistakes
in the code, so instead of removing it completely I used -pedantic in its place,
which produces a lot of warnings for not strictly ISO/ANSI compliant code that
relies on compiler-specific features.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1681 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 18:28:53 +00:00
dcnieho
4c37b66f1e
Added BlackBerry PlayBook support Bug memleak when getting the number of mouse buttons on a non-PlayBook where an appropriate device is found and the value is returned
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1674 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:05 +00:00
dcnieho
d8f19f2481
Made glutGet, for window width and height, return width and height determined by device rotation Now handles keyboard open/close (along wit device rotation while the keyboard is open) and resize The "back" operation now returns an ESCAPE key
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1671 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:34:17 +00:00
dcnieho
eb835cc833
Added support for rotation so an app can be rotated and FG will resize and manage the window in the background Additional documentation explaining why certain functions are implemented in the manner they are Changed QNX macro to a non deprecated one
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1670 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:33:57 +00:00
dcnieho
80d9609256
Minor order change in Android/BlackBerry CMake, one comment for BlackBerry window
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1654 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:27:24 +00:00
dcnieho
ee3500875c
Removed fg_main_blackberry.h. It wasn't needed
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1652 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:26:52 +00:00
dcnieho
9999328177
Can use input devices from x11 (serial input... unlikely to ever be used, but you never know) Fixed bug in fg_window_egl:fgPlatformSetWindow where a NULL window may be passed and cause a segfault Fixed bug where navigator events were never started Take into account DisplayMode when creating window buffers Proper fgPlatformSystemTime implementation (from fg_main_x11) Added support for mutlitouch (from fg_main_windows)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1650 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:26:20 +00:00
dcnieho
1357eb9fcf
Final commit before implementing main loop. All other code is implemented to the same level as Android.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1647 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:25:29 +00:00
dcnieho
8dba97d8a1
Implemented fg_window_blackberry.c to initialize and cleanup windows Implemented a BlackBerry specific fg_init so that bps can be started and stopped.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1646 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:25:10 +00:00
dcnieho
51b44c767f
Android and BlackBerry have a fair amount of overlap, for now.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1645 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:24:45 +00:00
dcnieho
11b3e1b393
Initial commit of BlackBerry implementation. It compiles, but doesn't have required functions implemented.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1644 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:24:23 +00:00
dcnieho
2bbf66ef98
Fixed CMake UNIX config when building only "freeglut_static" or only the shared library
...
- was setting a property on "freeglut" while "FREEGLUT_BUILD_SHARED_LIBS" was "OFF"
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1638 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-18 01:57:14 +00:00
dcnieho
467a9d3995
Change FREEGLUT_WARNINGS and *_ERRORS to FREEGLUT_PRINT_WARNINGS and *_ERRORS
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1599 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 10:51:07 +00:00
dcnieho
a78fe5852e
forgot to add teapot to sourcelist for gles1 and gles2 builds
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1591 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 02:55:45 +00:00
dcnieho
52bd423f58
using FREE_GLUT_BUILD_STATIC_LIBS and FREEGLUT_BUILD_SHARED_LIBS instead of their unprefixed counterparts to avoid these defs leaking into build settings for other projects.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1576 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 01:29:17 +00:00
dcnieho
dde06cbe5c
change CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR as requested on tracker ( Jim ( d3x0r ) - 2013-03-18 11:36:51 PDT )
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1575 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 01:23:27 +00:00
dcnieho
cd92d7fdd2
fixed documentation for GLUT_ICON (its not an environment variable, but
...
an identifier for a resource file) and added an example of it for the
One demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1530 7f0cb862-5218-0410-a997-914c9d46530a
2013-02-28 13:40:28 +00:00
dcnieho
813addede1
moving fgPlatformReshapeWindow and fgPlatformDisplayWindow from fg_main_x to fg_window_x. Hope this didn't break anything for X11 or andriod
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1504 7f0cb862-5218-0410-a997-914c9d46530a
2013-02-13 10:28:26 +00:00
dcnieho
17a8372217
can now configure build such that runtime warnings and/or errors occuring in lib are not printed to stderr (thanks Nigel Steward)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1501 7f0cb862-5218-0410-a997-914c9d46530a
2013-01-27 12:38:28 +00:00
dcnieho
a1daa9fc77
fixed install target:
...
- freeglut shared library now in /bin dir, as is its pdb file
- its import library, the static library and the static lib's debug info
are installed in /lib
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1399 7f0cb862-5218-0410-a997-914c9d46530a
2012-11-17 02:20:20 +00:00
dcnieho
1b92446cdd
adding option (on windows) to also install .pdb files
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1372 7f0cb862-5218-0410-a997-914c9d46530a
2012-07-24 17:38:58 +00:00
beuc
4d5e90860d
Fix compilation of demos/shapes
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1334 7f0cb862-5218-0410-a997-914c9d46530a
2012-06-09 17:38:24 +00:00
dcnieho
f0278c8e7a
added d suffix for debug builds of demos as well, MSVC only
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1326 7f0cb862-5218-0410-a997-914c9d46530a
2012-06-07 13:52:23 +00:00
beuc
299a491ae2
Clarify why check for XInput
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1325 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-29 18:33:22 +00:00
dcnieho
c8f74743db
spaceball demo is only meaningful on unix, don't build on other
...
platforms
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1323 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-25 01:35:06 +00:00
dcnieho
ce8d4a2137
on windows+MSVC, debug builds of the library now have a 'd' suffix.
...
freeglutdll.def was edited to no longer include the name of teh library
that would clash with this
and freeglut_std.h was edited to specify linking to the right library
when building in debug mode
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1322 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-25 01:31:25 +00:00
dcnieho
6afd5d5a83
no longer using sinf/cosfsqrtf in fg_geometry, no need for all this
...
extra boilerplate
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1319 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-21 09:36:23 +00:00
beuc
fae6135480
Multi-touch: fix CMake: Xi and XInput2.h detection wasn't ported from autoconf, effectively disabling multi-touch
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1315 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-13 09:08:35 +00:00
beuc
57532197dd
Multi-touch test program
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1311 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-08 17:09:38 +00:00
beuc
f36e176d61
CMake: add note about library versioning
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1310 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 19:11:41 +00:00
dcnieho
edd278df3c
slight formatting in CMake file, just cosmetic
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1305 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 00:52:45 +00:00
beuc
7f845a72dc
CHECK_FUNCTION_EXISTS for sinf/cosf/sqrtf actually fails not because of missing math.h, but because of missing -lm. Fixed.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1281 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 16:44:40 +00:00
beuc
628d9b7a7e
Detect sinf/cosf/sqrtf presence with CMake (instead of relying on __cpluscplus)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1276 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 14:14:54 +00:00
beuc
dad750d1df
Android: reference android library dependencies, needed for shared libs builds
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1273 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 09:33:05 +00:00
dcnieho
45b71f41a9
now using the Koch Snowflake (from fractals.dat) instead of Cantor dust
...
for fractals and fractals_random demo (changed built-in data).
Looks better
Also removed copying of fractals.dat to build dir from CMake file
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1272 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-30 15:19:59 +00:00