X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=ce0fa3f9dc8d99cdd8e8e6ef3190baa9088d9052;hb=82780a8852d09fa443add4565cebef4f6faefd4a;hp=30f94cd703a187dd8152d81512e90b6c52f7e6a3;hpb=2edf335a120e7bc33cb14bac5576fbadee89903b;p=lugaru.git

diff --git a/makefile b/makefile
index 30f94cd..ce0fa3f 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,7 @@
 
 macosx := false
 use_devil := false
+use_fmod := true
 
 BINDIR := bin
 RUNDIR := run
@@ -9,6 +10,9 @@ SDLDIR := SDL12
 LIBPNGDIR := libpng-1.2.8
 JPEGLIBDIR := jpeg-6b
 ZLIBDIR := zlib-1.2.3
+OPENALDIR := OpenAL
+LIBOGGDIR := libogg-1.0
+LIBVORBISDIR := libvorbis-1.0.1
 
 EXE := $(RUNDIR)/lugaru-bin
 
@@ -44,12 +48,18 @@ INCLUDES := \
 
 ifeq ($(strip $(use_devil)),true)
     DEFINES += -DUSE_DEVIL=1
-	INCLUDES += -I$(SRCDIR)/devil/include
+    INCLUDES += -I$(SRCDIR)/devil/include
 else
     DEFINES += -DZ_PREFIX=1
     INCLUDES += -I$(ZLIBDIR) -I$(LIBPNGDIR) -I$(JPEGLIBDIR)
 endif
 
+ifeq ($(strip $(use_fmod)),false)
+    DEFINES += -DUSE_OPENAL=1
+    INCLUDES += -I$(OPENALDIR)/include -I$(LIBOGGDIR)/include -I$(LIBVORBISDIR)/include
+endif
+
+
 CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char -pipe
 CFLAGS += -w
 
@@ -60,12 +70,18 @@ ifeq ($(strip $(macosx)),true)
   APPLDFLAGS := $(SDLDIR)/lib/libSDL-1.2.0.dylib $(SDLDIR)/lib/libSDLmain-osx.a
 else
   CFLAGS += -DPLATFORM_LINUX=1
-  LDFLAGS := ./libSDL-1.2.so.0 ./libfmod.so
+  LDFLAGS := ./libSDL-1.2.so.0
   POSTLDFLAGS := /usr/lib/libGLU.a
 
   ifeq ($(strip $(use_devil)),true)
     LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
   endif
+
+  ifeq ($(strip $(use_fmod)),true)
+    POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
+  else
+    LDFLAGS += ./openal.so
+  endif
 endif
 
 CXXFLAGS := $(CFLAGS)
@@ -98,6 +114,7 @@ SRCS := \
 	logger/logger.cpp \
 	WinInput.cpp \
 	OpenGL_Windows.cpp \
+	openal_wrapper.cpp \
 
 SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f))
 
@@ -194,11 +211,45 @@ ZLIBSRCS = \
 
 ZLIBSRCS := $(foreach f,$(ZLIBSRCS),$(ZLIBDIR)/$(f))
 
-
-ifneq ($(strip $(use_devil)),true)
+OGGSRCS := \
+	bitwise.o \
+	framing.o
+
+OGGSRCS := $(foreach f,$(OGGSRCS),$(LIBOGGDIR)/src/$(f))
+
+VORBISSRCS := \
+	analysis.o \
+    bitrate.o \
+    block.o \
+    codebook.o \
+    envelope.o \
+    floor0.o \
+    floor1.o \
+    info.o \
+    lpc.o \
+    lsp.o \
+    mapping0.o \
+    mdct.o \
+    psy.o \
+    registry.o \
+    res0.o \
+    sharedbook.o \
+    smallft.o \
+    synthesis.o \
+    vorbisfile.o \
+    window.o
+
+VORBISSRCS := $(foreach f,$(VORBISSRCS),$(LIBVORBISDIR)/lib/$(f))
+
+
+ifeq ($(strip $(use_devil)),false)
     SRCS += $(PNGSRCS) $(JPEGSRCS) $(ZLIBSRCS)
 endif
 
+ifeq ($(strip $(use_fmod)),false)
+    SRCS += $(OGGSRCS) $(VORBISSRCS)
+endif
+
 OBJS := $(SRCS:.CC=.o)
 OBJS := $(OBJS:.cc=.o)
 OBJS := $(OBJS:.cpp=.o)
@@ -238,8 +289,10 @@ clean:
 	rm -f $(BINDIR)/$(SRCDIR)/*.o
 	rm -f $(BINDIR)/$(SRCDIR)/logger/*.o
 	rm -f $(BINDIR)/$(LIBPNGDIR)/*.o
-	rm -f $(BINDIR)/$(JPEGLIB)/*.o
+	rm -f $(BINDIR)/$(JPEGLIBDIR)/*.o
 	rm -f $(BINDIR)/$(ZLIBDIR)/*.o
+	rm -f $(BINDIR)/$(LIBOGGDIR)/src/*.o
+	rm -f $(BINDIR)/$(LIBVORBISDIR)/lib/*.o
 	rm -f $(EXE)
 
 # end of makefile ...