diff options
| author | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
|---|---|---|
| committer | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
| commit | f0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch) | |
| tree | ea9caba04ed3c5b3005edd79060002cb66a5e03a /progs/demos/morph3d.c | |
| parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
| parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) | |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'progs/demos/morph3d.c')
| -rw-r--r-- | progs/demos/morph3d.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/progs/demos/morph3d.c b/progs/demos/morph3d.c index 162a6ff847..6aca8270ff 100644 --- a/progs/demos/morph3d.c +++ b/progs/demos/morph3d.c @@ -826,7 +826,7 @@ static void pinit(void) } -static void INIT(void) +int main(int argc, char **argv) { printf("Morph 3D - Shows morphing platonic polyhedra\n"); printf("Author: Marcelo Fernandes Vianna (vianna@cat.cbpf.br)\n\n"); @@ -841,6 +841,7 @@ static void INIT(void) object=1; + glutInit(&argc, argv); glutInitWindowPosition(0,0); glutInitWindowSize(640,480); @@ -888,9 +889,3 @@ static void INIT(void) glutMainLoop(); } - -int main(int argc, char **argv) -{ - INIT(); - return(0); -} |