aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2012-09-21 18:24:57 +0200
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2012-09-21 18:24:57 +0200
commit75667b81215bdb3896599ec477a256c41fc90436 (patch)
tree44eb5919b596666997b972fc75fe5fdea60a633b /Makefile
parent0e81cd9a89de9bdd6824bbe7265f91f3835dae97 (diff)
downloadosc-graphics-75667b81215bdb3896599ec477a256c41fc90436.tar.gz
split program into multiple files; switched to C++
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ed8c08f..30fa973 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
PREFIX := /usr/local
+CXX := g++
CC := gcc
SDL_CFLAGS := $(shell sdl-config --cflags)
@@ -18,17 +19,18 @@ LIBLO_CFLAGS := $(shell pkg-config liblo --cflags)
LIBLO_LDFLAGS := $(shell pkg-config liblo --libs)
CFLAGS ?= -g -O0
-CFLAGS += -std=c99 -Wall \
+CFLAGS += -Wall \
$(SDL_CFLAGS) $(SDL_IMAGE_CFLAGS) $(SDL_GFX_CFLAGS) \
$(LIBVLC_CFLAGS) $(LIBLO_CFLAGS)
+CXXFLAGS := $(CFLAGS)
LDFLAGS := -lm \
$(SDL_LDFLAGS) $(SDL_IMAGE_LDFLAGS) $(SDL_GFX_LDFLAGS) \
$(LIBVLC_LDFLAGS) $(LIBLO_LDFLAGS)
all : osc-graphics
-osc-graphics : main.o
- $(CC) $(LDFLAGS) $^ -o $@
+osc-graphics : main.o layer.o layer_box.o layer_image.o layer_video.o
+ $(CXX) $(LDFLAGS) $^ -o $@
install : all
cp osc-graphics $(PREFIX)/bin