--- Makefile.orig	2016-03-06 13:27:40 UTC
+++ Makefile
@@ -1,12 +1,13 @@
-
 SDL_CFLAGS = `sdl-config --cflags`
 SDL_LIBS = `sdl-config --libs`
-VORBIS_LIBS = -lvorbisidec
-MODPLUG_LIBS = -lmodplug
+VORBIS_CFLAGS = `pkg-config --cflags vorbisidec`
+VORBIS_LIBS = `pkg-config --libs vorbisidec`
+#MODPLUG_CFLAGS = `pkg-config --cflags libmodplug`
+#MODPLUG_LIBS = `pkg-config --libs libmodplug`
 ZLIB_LIBS = -lz
 
-CXX := clang++
-CXXFLAGS := -Wall -MMD $(SDL_CFLAGS) -DUSE_ZLIB # -DUSE_MODPLUG
+CXX ?= clang++
+CXXFLAGS += -Wall -MMD $(SDL_CFLAGS) $(VORBIS_CFLAGS) -DUSE_ZLIB # -DUSE_MODPLUG
 
 SRCS = collision.cpp cutscene.cpp file.cpp fs.cpp game.cpp graphics.cpp main.cpp menu.cpp \
 	mixer.cpp mod_player.cpp ogg_player.cpp piege.cpp resource.cpp resource_aba.cpp \
@@ -16,7 +17,7 @@ SRCS = collision.cpp cutscene.cpp file.c
 OBJS = $(SRCS:.cpp=.o)
 DEPS = $(SRCS:.cpp=.d)
 
-LIBS = $(SDL_LIBS) $(VORBIS_LIBS) $(MODPLUG_LIBS) $(ZLIB_LIBS)
+LIBS = $(SDL_LIBS) $(VORBIS_LIBS) $(ZLIB_LIBS)
 
 rs: $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)