X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=2719849431c66d7203f874efed313a544ac6f517;hb=7ac3a3a152a11ac5da99c1d2db9aa57c93f65202;hp=2e74c4f2bb11d79408beb210e1eb722c5f69cac9;hpb=b5f9f90139d115ea7453ac298bb72a4c51724bd5;p=lugaru.git

diff --git a/makefile b/makefile
index 2e74c4f..2719849 100644
--- a/makefile
+++ b/makefile
@@ -17,8 +17,8 @@ LIBVORBISDIR := libvorbis-1.0.1
 
 EXE := $(RUNDIR)/lugaru-bin
 
-CXX := ccache /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
-CC := ccache /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/gcc
+CXX := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
+CC := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/gcc
 #CXX := g++
 #CC := gcc
 LD := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
@@ -72,7 +72,7 @@ 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
+  LDFLAGS := ./libSDL-1.2.so.0 -Wl,-rpath,\$$ORIGIN
 
   ifeq ($(strip $(use_devil)),true)
     LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
@@ -81,7 +81,7 @@ else
   ifeq ($(strip $(use_fmod)),true)
     POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
   else
-    LDFLAGS += ./openal.so
+    LDFLAGS += ./libopenal.so.1
   endif
 endif
 
@@ -218,6 +218,7 @@ GLUSRCS := \
 	geom.c \
 	memalloc.c \
 	mesh.c \
+	mipmap.c \
 	normal.c \
 	priorityq.c \
 	render.c \