X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=ce0fa3f9dc8d99cdd8e8e6ef3190baa9088d9052;hb=0e06ef535cf522b55e2ba29178a4c188094fa038;hp=a77ff9930cd373260510d4c48a19aa918f8c5b38;hpb=c88c85ccba7b78237e78b24ed30d776591b27340;p=lugaru.git

diff --git a/makefile b/makefile
index a77ff99..ce0fa3f 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 
 macosx := false
 use_devil := false
-use_fmod := false
+use_fmod := true
 
 BINDIR := bin
 RUNDIR := run
@@ -10,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
 
@@ -45,7 +48,7 @@ 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)
@@ -53,6 +56,7 @@ endif
 
 ifeq ($(strip $(use_fmod)),false)
     DEFINES += -DUSE_OPENAL=1
+    INCLUDES += -I$(OPENALDIR)/include -I$(LIBOGGDIR)/include -I$(LIBVORBISDIR)/include
 endif
 
 
@@ -74,7 +78,9 @@ else
   endif
 
   ifeq ($(strip $(use_fmod)),true)
-	./libfmod.so
+    POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
+  else
+    LDFLAGS += ./openal.so
   endif
 endif
 
@@ -205,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)
@@ -249,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 ...