redo branch is now trunk.

git-svn-id: svn://mattst88.com/svn/glpong/trunk@8 449aeecc-241a-0410-943f-e2f883e2d7a2

1 files changed, 27 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 8333d28..69f36fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,27 @@
-CC=gcc

-STRIP=strip

-WARN=-Wall -W -ansi -pedantic

-CFLAGS=-Os -pipe -std=c99 ${WARN} -g

-LDFLAGS=-Wl,-O1

-INCLUDES=`sdl-config --cflags`

-LIBRARIES=`sdl-config --libs` -lSDL_image -lGL

-EXT=.exe

-

-EXE=glpong${EXT}

-

-OBJS=glpong.o ball.o paddle.o

-	

-all: ${OBJS}

-	${CC} ${LDFLAGS} ${OBJS} -o ${EXE} ${LIBRARIES}

-

-clean:

-	rm -f ${OBJS}

-	rm -f ${EXE}

-

-rebuild: clean all

-remake: rebuild

-

-%.o: %.c

-	${CC} ${CFLAGS} ${INCLUDES} -c -o $@ $<

-	

+CC=gcc
+STRIP=strip
+WARN=-Wall -W -ansi -pedantic
+DEFINES=-DINLINE=inline
+CFLAGS=-Os -pipe -std=c99 -g ${DEFINES} -Wall #${WARN}
+LDFLAGS=-Wl,-O1
+INCLUDES=`sdl-config --cflags`
+LIBRARIES=`sdl-config --libs` -lSDL_image -lGL
+EXT=.exe
+
+EXE=glpong${EXT}
+
+OBJS=glpong.o ball.o #paddle.o
+	
+all: ${OBJS}
+	${CC} ${LDFLAGS} ${OBJS} -o ${EXE} ${LIBRARIES}
+
+clean:
+	rm -f ${OBJS}
+	rm -f ${EXE}
+
+rebuild: clean all
+remake: rebuild
+
+%.o: %.c
+	${CC} ${CFLAGS} ${INCLUDES} -c -o $@ $<
+