From 75667b81215bdb3896599ec477a256c41fc90436 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Fri, 21 Sep 2012 18:24:57 +0200 Subject: split program into multiple files; switched to C++ --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3