From c012f7cd9295d346519ed24e16e78ce5d553f329 Mon Sep 17 00:00:00 2001 From: Ash Tyndall Date: Fri, 7 Oct 2011 22:46:08 +0800 Subject: [PATCH] makefile commit --- Makefile | 3 +-- scene.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 02a1589..d410e7c 100644 --- a/Makefile +++ b/Makefile @@ -27,5 +27,4 @@ CFLAGS += -O3 -Wall -std=c99 all: scene scene: scene.c bitmap.c bitmap.h - gcc $(CFLAGS) -o scene scene.c bitmap.c $(LIBS) - git commit -m "makefile commit" + gcc $(CFLAGS) -o scene scene.c bitmap.c $(LIBS) && git commit -a -m "makefile commit" diff --git a/scene.c b/scene.c index 251c556..b12ed15 100644 --- a/scene.c +++ b/scene.c @@ -226,11 +226,11 @@ void makeMenu() { object = glutCreateMenu(processObjectEvents); for ( int i = 0; objectMenuEntries[i]; i++ ) { glutAddMenuEntry( objectMenuEntries[i], i ); - + } - glutCreateMenu(mymenu); + glutCreateMenu(processMainEvents); glutAddMenuEntry("Exit", 99); glutAttachMenu(GLUT_RIGHT_BUTTON); } -- 2.20.1