Commit Graph

1498 Commits

Author SHA1 Message Date
jtsiomb
15e9bb8752 Added a few more details to README.cmake
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1126 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 19:05:32 +00:00
dcnieho
01f323da92 removed VC6 files
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1125 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 11:13:06 +00:00
dcnieho
64fb938163 Removed VS2008 and VS2010 files
set ignore for my /build directory, removed ignore for config.h.in


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1124 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 11:08:26 +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
41283a36c5 added a quick tut for using cmake, adapted from http://mash-project.eu/wiki/index.php/CMake:_Quick_Start_Guide
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1122 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 08:24:20 +00:00
dcnieho
b6e8aa6776 moved glutTimerFunc in timer demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1121 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 16:33:46 +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
83672b987c HAVE_ULONG_LONG now only defined when unsigned long long is available
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1115 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 23:35:11 +00:00
beuc
2930d1d941 Rename Android and EGL files
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1114 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 16:01:29 +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
ed993a1882 moved common files back to src root
renamed (a bunch of) the freeglut_ prefixes to fg_
did the necessary edits of the source files (I hope)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1111 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 14:59:56 +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
5280ea4f52 Add development progress status for Android
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1108 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:45:20 +00:00
beuc
581d0b266e Add .gitignore file to work with git-svn
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1107 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:35:29 +00:00
beuc
8b09e1ff0d autotools: Android port
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1106 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:34:30 +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
402c9871eb Support GLES headers
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1104 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:30:51 +00:00
beuc
eb37483010 Android documentation
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1103 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:18:53 +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
beuc
c8a8d03fc5 Add base Android and EGL code
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1101 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 08:55:24 +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
dcnieho
429507ee23 in freeglut_init set gamemode defaults to -1 (no change from current
display mode) so that it is not attempted to change the display mode
to some arbitrary default when entering gamemode (only applies if
glutGameModeString is never called)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1097 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-10 03:17:55 +00:00
dcnieho
ec322806c9 moved some windows only code from common to windows specific
got rid of fgPlatformGlutLayerGet as we'll never implement layer support
(added some notes too)
added note about implementability of glutGetModeValues
Moved joystick function from misc to Joystick code file



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1096 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-10 03:07:13 +00:00
dcnieho
8197972757 XParseGeometry include now compiles with windows (VS2010, didn't touch
cmake)
Various typos in comments
Some other cleanup and formatting
glutInitDisplayString now understands "borderless"


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1095 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-10 02:03:32 +00:00
beuc
4ce337a008 Include xparsegeometry_repl.h header on non-X11 targets
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1094 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 21:02:20 +00:00
beuc
d06a04e27e Make XParseGeometry reusable by several ports (3)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1093 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:54:03 +00:00
beuc
3ab598b0fb Make XParseGeometry reusable by several ports (2)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1092 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:48:03 +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
11a4f362e1 Add CMake toolchain script for mingw32/64 compilation, and update documentation
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1090 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:34:51 +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
208fc83528 CMake now defines HAVE_VFPRINTF for windows; suppress redefinition warning
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1088 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-09 20:29:58 +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
dcnieho
deb9971814 updated resource file
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1082 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-08 02:31:00 +00:00
dcnieho
6f04edd242 just a bit of formatting, mostly to test out my SVN commit access
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1081 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-08 02:23:21 +00:00
fayjf
2774b223ff A bit of comment clean-up per e-mail from Diederick Niehorster dated 2/5/12 at 9:26 AM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1080 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-25 06:06:52 +00:00
fayjf
9c6c6850d0 Implementing the monotonic clock if available, per e-mail from Phil Vandry dated 2/17/12 at 5:08 PM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1079 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-25 05:47:57 +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
2f7431648d Moving some Windows-specific preprocessor stuff and a prototype from "freeglut_init.c" to the Windows header file
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1077 7f0cb862-5218-0410-a997-914c9d46530a
2012-02-12 04:41:32 +00:00