X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=28740fe5ab222cffd7d54ac1a2fa006355595d87;hb=c62522f90f5dc405505af885e00c8134f17d8c88;hp=7a167171ccb12a7037b24c4f6f757f26c0d4ad8e;hpb=9a6e6bc703ee7942f4c39b4ae13f339654206456;p=lugaru.git

diff --git a/makefile b/makefile
index 7a16717..28740fe 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,7 @@
 
 macosx := false
 use_devil := false
+use_fmod := false
 
 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
 
@@ -18,8 +22,8 @@ CC := ccache gcc
 #CC := gcc
 LD := g++
 
-OPT := -O0
-#OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
+#OPT := -O0
+OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
 #OPT := -Os -fno-strict-aliasing
 
 # always use this on the Mac, even in debug builds, since we aren't building
@@ -44,13 +48,19 @@ 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
 
-CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char
+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
 
 ifeq ($(strip $(macosx)),true)
@@ -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)
@@ -96,14 +112,18 @@ SRCS := \
 	Weapons.cpp \
 	MacCompatibility.cpp \
 	logger/logger.cpp \
-	DRIVER.CC \
-	MD5.CC \
 	WinInput.cpp \
 	OpenGL_Windows.cpp \
+	openal_wrapper.cpp \
 
 SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f))
 
 
+UNUSED_SRCS := \
+	DRIVER.CC \
+	MD5.CC \
+
+
 PNGSRCS := \
     png.c \
     pngerror.c \
@@ -191,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)
@@ -212,7 +266,7 @@ $(BINDIR)/%.o : %.cpp
 	$(CXX) -o $@ $(CXXFLAGS) $<
 
 $(BINDIR)/%.o : %.CC
-	$(CXX) -o $@ $(CXXFLAGS) $<
+	$(CXX) -x c++ -o $@ $(CXXFLAGS) $<
 
 $(BINDIR)/%.o : %.cc
 	$(CXX) -o $@ $(CXXFLAGS) $<
@@ -235,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 ...