From 9ef2aa5ff05e66c0d7f7ad94d13dbc2669494142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sun, 16 Feb 2014 14:58:07 +0100 Subject: [PATCH] Allow compiling without fmod Later, we will need to provide an alternative to fmod, as it is badly distributed on linux distributions. --- Makefile | 2 +- src/audio.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d55bb54..ba864f5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ GFXFLAGS = `sdl-config --cflags` GFXLIBS = `sdl-config --libs` -lGL -lGLU -lSDL_image ifeq ($(FMOD), yes) - SNDFLAGS = -DUSEFMOD=1 + SNDFLAGS = -DAUDIO_FMOD=1 SNDLIBS = -lfmod-3.5 endif diff --git a/src/audio.h b/src/audio.h index 73daa86..5317257 100644 --- a/src/audio.h +++ b/src/audio.h @@ -2,13 +2,6 @@ #define __AUDIO_H_INCLUDED__ -//#define AUDIO_NONE -#define AUDIO_FMOD -//Only FMOD and NONE is supported, choose one - - - - #ifdef AUDIO_FMOD #include #endif