X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=28740fe5ab222cffd7d54ac1a2fa006355595d87;hb=99d73d380e7376505a4033813d5d560ebaea05d1;hp=b494ff1720ded252683598d691139d1b93341de8;hpb=54386b13c746c1a8423b9549d0cfd922aae9a8f7;p=lugaru.git

diff --git a/makefile b/makefile
index b494ff1..28740fe 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 
 macosx := false
 use_devil := false
-use_fmod := true
+use_fmod := false
 
 BINDIR := bin
 RUNDIR := run
@@ -22,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
@@ -78,7 +78,7 @@ else
   endif
 
   ifeq ($(strip $(use_fmod)),true)
-    LDFLAGS += ./libfmod.so
+    POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
   else
     LDFLAGS += ./openal.so
   endif
@@ -289,7 +289,7 @@ 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