Skip to content

Commit

Permalink
Move around files
Browse files Browse the repository at this point in the history
  • Loading branch information
halogenandtoast committed Jul 18, 2012
1 parent 7769554 commit 7ab390f
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 12 deletions.
21 changes: 10 additions & 11 deletions Makefile
@@ -1,18 +1,17 @@
CC = g++
LDFLAGS=-framework GLUT -framework OpenGL -lGLEW
all: main
LDFLAGS = -framework GLUT -framework OpenGL -lGLEW
CFLAGS = -O
SRC = src/main.cc src/program.cc src/shader.cc
OBJ = ${SRC:.c=.o}

main: main.o shader.o program.o
${CC} ${LDFLAGS} main.o shader.o program.o -o main
all: main

main.o: main.cc
${CC} -c main.cc
.c.o:
${CC} -c ${CFLAGS} -o $@ $<

shader.o: shader.cc
${CC} -c shader.cc
main: ${OBJ}
${CC} ${LDFLAGS} ${OBJ} -o main

program.o: program.cc
${CC} -c program.cc

clean:
rm -rf *o main
rm -rf src/*.o main
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion main.cc → src/main.cc
Expand Up @@ -35,7 +35,7 @@ int main(int argc, char *argv[])
glewExperimental = GL_TRUE;
glewInit();

program = new Program("main.vert.glsl", "main.frag.glsl");
program = new Program("shaders/main.vert.glsl", "shaders/main.frag.glsl");
position = glGetAttribLocation(program->getProgram(), "position");
glGenBuffers(1, &vbo);
glBindBuffer(GL_ARRAY_BUFFER, vbo);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7ab390f

Please sign in to comment.