beuc
604018bc92
Implement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1183 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-17 15:36:25 +00:00
beuc
3ce776e21e
EGL: more code reusability
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1178 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-17 12:34:22 +00:00
beuc
04e3e33ad7
Move OpenGL ES stubs out of Android
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1175 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-17 10:33:28 +00:00
beuc
5149d43941
EGL: make more code reusable - less Android-specific
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1174 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-17 10:30:31 +00:00
beuc
31e0027e09
Move EGL fields to a separate structure for reusability (e.g. upcoming Mesa X11 EGL support)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1161 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 23:23:19 +00:00
beuc
cb3dea2183
CMake: Declare OPTIONS higher in the file so they can be used to conditionaly include source files
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1160 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 21:39:37 +00:00
beuc
f6111f49ac
GLES1 and GLES2 versions are now compiled with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly bootstrap headers inclusion
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1159 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 21:30:26 +00:00
beuc
ea875680a5
CMake: use same test for referencing and generating freeglutdll.def
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1158 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 20:43:29 +00:00
beuc
bae0c12952
Add pkg-config script (cmake changes added by mistake in previous commit)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1142 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 20:51:24 +00:00
beuc
02880439ed
CMake: Move -DANDROID in the toolchain script, to ease reuse of this file
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1141 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 20:48:32 +00:00
dcnieho
792977034a
no need for a message on MSVC that we hide insecure CRT warnings
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1138 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 03:07:57 +00:00
dcnieho
cb228b70f0
oops, generating freeglutdll.def was not specific to MSVC
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1137 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 03:06:42 +00:00
dcnieho
0cfd678fda
converted all tabs to spaces for CMake file, eases editing and indenting
...
in diffs looks right
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1136 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 02:34:33 +00:00
dcnieho
7bd8533032
FreeGLUT version number is now only defined in CMake file. All other
...
files containing a version number are now automatically generated upon
configure
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1135 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 02:30:50 +00:00
dcnieho
ed02f5da91
found both SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
...
and SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) were used,
removed the second (deprecated) commands
This results in shared libraries being build in /bin on windows, but not
other platforms, obviating the need to copy dlls to /bin. Documented
this
the copy of fractals.dat should now work on all platforms (hopefully)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1123 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 11:03:23 +00:00
dcnieho
19095d15bf
added to CMake a setup to copy shared lib (MSVC only right now) and
...
fractals.dat to demo binary folder if demos are built
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1120 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 15:41:39 +00:00
dcnieho
b16eb164ca
cleaneup \machine setting for MSVC, now only for 64bit static libs, only
...
onwe for which needed. Added a comment showing why its needed
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1119 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 07:26:37 +00:00
dcnieho
b2159329f2
.def and .rc file were appended to source list AFTER target was defined,
...
so moved them up in the file
now setting target machine for linker, or we get in trouble at least
with static libs on x64
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1118 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 05:07:35 +00:00
dcnieho
d3496a2968
now only setting FREEGLUT_EXPORTS and FREEGLUT_STATIC for the shared and
...
static dll/lib respectively, instead of globally defining those for all
targets
That revealed the static build of the demos is broken, needed to add the
FREEGLUT_STATIC definition there too
Not including .def file on windows if 64 bit build.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1117 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 04:24:40 +00:00
dcnieho
fe9b63c890
now use unsigned __int64 for time type when on MSVC, that is supported
...
down to at least MSVC6 (thanks Sisyphus!)
Also, type present checks are not done if stdint or inttypes headers are
found, no need for them then.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1116 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 03:32:53 +00:00
dcnieho
2549248d0c
Need for our XParseGeometry implementation now detected by CMake
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1113 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 15:26:01 +00:00
dcnieho
b66e4bfa9d
and some more renames
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1112 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 15:14:33 +00:00
dcnieho
e78202b0af
timers internally now use 64bit unsigned int, if available
...
External timer info (glutGet) unchanged.
Some work to do to improve Windows timers beyond what it is now...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1110 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 13:03:14 +00:00
beuc
49bfb6bd84
CMake: add precision about version-info / soname
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1109 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:53:22 +00:00
beuc
5ed946ec5d
CMake: Android port
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1105 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:31:44 +00:00
beuc
70e2afb9cc
CMake: option to build with OpenGL ES
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1102 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:18:15 +00:00
jtsiomb
cf7613066d
added the timer demo
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1100 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-10 14:55:50 +00:00
dcnieho
0c5025cc85
added not about soversion for those not knowledgable (like me). Thanks
...
Sylvain!
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1099 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-10 12:53:50 +00:00
dcnieho
5cc61b4c30
CMake updates:
...
- no longer trying to link with m.lib (tht maths for linux)
- now building demos for static and for shared library, depending on
which libraries are created
- TARGET_LINK_LIBRARIES statement conditional on whether the relevant
shared/static library is built
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1098 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-10 11:08:44 +00:00
beuc
426ce85a73
Make XParseGeometry reusable by several ports
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1091 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:46:15 +00:00
beuc
e3c597fe0d
Specify libraries for windows static compilation
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1089 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:33:54 +00:00
beuc
132ca5afcb
Detect vfprintf (used in fgError/fgWarning)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1087 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:20:20 +00:00
beuc
d93aff53ec
Fix .so dependencies: reference -lGL and -lm; only reference -lGLU for demos (Resizer)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1086 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:02:30 +00:00
beuc
cd204c47f8
Properly add maths library for demos
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1085 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 19:49:49 +00:00
beuc
fb34e2f593
Add maths library for demos
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1084 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 19:24:57 +00:00
beuc
d0a550b30a
Fix X86vmode library detection
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1083 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 19:17:37 +00:00
fayjf
84d7d3bf86
Checking for "gettimeofday" per e-mail from John Tsiombikas dated 2/23/12 at 9:29 AM
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1078 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-25 05:34:24 +00:00
fayjf
3eca89fc14
Setting the line endings and keywords on a bunch of new text files
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1076 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-08 02:39:29 +00:00
fayjf
b40d212cfb
Putting in many 'CMakeLists.txt' fixes per e-mail from John Tsiombikas dated February 6, 2012 at 4:38 AM
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1075 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-07 01:56:50 +00:00
fayjf
64953686de
Removing the "freeglut_glutfont_definitions.c" dependency from the Windows part of the "cmake" input and from the MSVC 6.0 files
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1039 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-04 05:23:24 +00:00
fayjf
79007d8cac
Fixing "cmake" with the new location of the "freeglut_xinput_x11.c" file
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1036 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-04 05:10:51 +00:00
fayjf
6ac5889df6
Putting the platform-specific files into the "Cmake" input
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@980 7f0cb862-5218-0410-a997-914c9d46530a
2012-01-17 04:36:09 +00:00
fayjf
132f622a2a
Moving the source code files from 'src' to 'src/Common' as a first step towards separating out the platform-specific code. This builds in MSVC 6.0 and I tried to catch all the other build systems, but I'm sure I broke *something*.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@976 7f0cb862-5218-0410-a997-914c9d46530a
2012-01-10 03:49:12 +00:00
fayjf
2331ec9b19
Adding header files to the "freeglut" projects per e-mail from Paul Martz dated 1/9/12 at 1:22 PM
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@975 7f0cb862-5218-0410-a997-914c9d46530a
2012-01-10 02:05:59 +00:00
fayjf
f4e9f3aa31
Making the building of demo programs optional, but enabled by default per e-mail from Paul Martz dated 1/9/12 at 8:56 AM
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@974 7f0cb862-5218-0410-a997-914c9d46530a
2012-01-10 02:01:19 +00:00
fayjf
2adc0ddf75
Fixing the "cmake" inputs to build the "spaceball" demo properly per e-mail from Paul Martz dated 1/8/12 at 12:03 PM
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@972 7f0cb862-5218-0410-a997-914c9d46530a
2012-01-08 19:25:33 +00:00
fayjf
9510d7557c
Getting "cmake" to work on MSVC 6.0. Instructions are in e-mail from David Brown dated 1/3/2012 at 11:43 PM.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@971 7f0cb862-5218-0410-a997-914c9d46530a
2012-01-08 04:59:13 +00:00
fayjf
d031a5c93f
Adding the first step towards "cmake" support. It does not work with MSVC 6.0 yet.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@970 7f0cb862-5218-0410-a997-914c9d46530a
2012-01-08 04:37:34 +00:00