From: <be...@us...> - 2012-03-15 20:37:48
|
Revision: 1140 http://freeglut.svn.sourceforge.net/freeglut/?rev=1140&view=rev Author: beuc Date: 2012-03-15 20:37:41 +0000 (Thu, 15 Mar 2012) Log Message: ----------- A few fixes in cygwin docs Modified Paths: -------------- trunk/freeglut/freeglut/LISEZMOI.cygwin_mingw trunk/freeglut/freeglut/README.cygwin_mingw Modified: trunk/freeglut/freeglut/LISEZMOI.cygwin_mingw =================================================================== --- trunk/freeglut/freeglut/LISEZMOI.cygwin_mingw 2012-03-15 19:52:16 UTC (rev 1139) +++ trunk/freeglut/freeglut/LISEZMOI.cygwin_mingw 2012-03-15 20:37:41 UTC (rev 1140) @@ -101,7 +101,7 @@ -Quelques remarques sur le makefile +Quelques remarques sur le Makefile * Ce makefile cr\xE9e une dll, une biblioth\xE8que statique (une archive, en d'autres termes) et la biblioth\xE8que dynamique qui permettra l'utilisation @@ -150,7 +150,7 @@ include, correspondants \xE0 Glut, si vous l'avez install\xE9 avec Cygwin. -Utilisation de la librairie +Utilisation de la biblioth\xE8que * Nous allons tester avec le programme shapes, pr\xE9sent dans progs/demos/shapes @@ -214,5 +214,5 @@ (paix \xE0 ses cendres). o Rien de particulier \xE0 signaler. - * Merci \xE0 tous les mainteneurs courageux de Freeglut, qu'on croyait mort, - mais qui bouge encore. + * Merci \xE0 tous les mainteneurs courageux de Freeglut, qu'on croyait morts, + mais qui bougent encore. Modified: trunk/freeglut/freeglut/README.cygwin_mingw =================================================================== --- trunk/freeglut/freeglut/README.cygwin_mingw 2012-03-15 19:52:16 UTC (rev 1139) +++ trunk/freeglut/freeglut/README.cygwin_mingw 2012-03-15 20:37:41 UTC (rev 1140) @@ -8,24 +8,21 @@ Under Windows, one can use it with Cygwin. Easy? Yes, if one agrees to distribute "cygwin1.dll". Let us help freeglut gain its independence ! -m.\xE0.j 10/7/2009: generation of a library for linking without the DLL. +Update 10/7/2009: generation of a library for linking without the DLL. -Recovery of the sources +Grabbing the sources - * Download the sources of version 2.6.0 which integrates recent changes. - * For the moment, it is a RC (Release Candidate), but the final version - should not delay. - * The use of the 2.6 is preferable with the 2.4-stable branch because many + * Download the sources for version 2.6.0 which integrates recent changes. + * Using version 2.6 is better than the 2.4-stable branch because many bugs have been corrected. * You will find the sources on the site of Freeglut: o http://freeglut.sourceforge.net/ -Objectives and preparation -Objectives +Goals - * We will create a DLL related to Cygwin, and an independent static library + * We will create a DLL for Cygwin, and an independent static library * We will also create a dynamic library, allowing linking with the DLL. @@ -67,7 +64,7 @@ * Here Makefile which will make the deal: #Makefile for Freeglut 2.6.0-rc and Cygwin -#To place in the directory \x93src/Common\x94 +#To place in the directory 'src/Common' sources=$ (wildcard *.c) objs=$ (sources: .c=.o) @@ -81,25 +78,25 @@ all: $ (objs) #construction DLL related to cygwin1.dll - GCC $ (nocyg) $ (objs) - shared $ (LDFLAGS) - O $ (libname) .dll - Nm $ (libname) .dll | awk \x93BEGIN {print \x93EXPORTS\x94} /T _glut/{sub (/^.*T _/,\x94 \ T "); print}\x94 > $ (libname) .def - dlltool --dllname $ (libname) .dll --input-def $ (libname) .def --output-lib lib$ (libname) dll.a + gcc $(nocyg) $(objs) -shared $(LDFLAGS) -o $(libname).dll + nm $(libname).dll | awk 'BEGIN { print "EXPORTS" } /T _glut/ {sub( /^.*T _/, "\t"); print}' > $(libname).def + dlltool --dllname $(libname).dll --input-def $(libname).def --output-lib lib$(libname)dll.a #construction static library independent of cygwin - rear Cr lib$ (libname) .a $ (objs) + ar cr lib$(libname).a $(objs) #pas inevitably obligatory (creation of an index to accelerate the accesses) - ranlib lib$ (libname) .a + ranlib lib$(libname).a %.o: %.c - GCC $ (nocyg) - C $ (CFLAGS) $< + gcc $(nocyg) -c $(CFLAGS) $< clean: - rm - F *.o $ (libname) .dll $ (libname) .def lib$ (libname) dll.a lib$ (libname) .a + rm -f *.o $(libname).dll $(libname).def lib$(libname)dll.a lib$(libname).a -Some remarks on the makefile +Some remarks on the Makefile * This makefile creates a DLL, a static library (a file, in other words) and the dynamic library which will allow the use of the DLL. @@ -127,8 +124,8 @@ library the functions that are not related to freeglut. o then, one uses dlltool in a very traditional way. -Nm $ (libname) .dll | awk \x93BEGIN {print \x93EXPORTS\x94} /T _glut/{sub (/^.*T _/,\x94 \ T "); print}\x94 > $ (libname) .def -dlltool --dllname $ (libname) .dll --input-def $ (libname) .def --output-lib lib$ (libname) dll.a +nm $(libname).dll | awk 'BEGIN { print "EXPORTS" } /T _glut/ {sub( /^.*T _/, "\t"); print}' > $(libname).def +dlltool --dllname $(libname).dll --input-def $(libname).def --output-lib lib$(libname)dll.a @@ -202,7 +199,7 @@ o http://jocelyn.frechot.free.fr/freeglut/ -Something survived\x85 +Something survived... * I also tested the recompiling of the demonstrations of the original lib GLUT (peace with its ashes). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |