Behold the magic of ld -rpath $ORIGIN ...!

[lugaru.git] / makefile

diff --git a/makefile b/makefile
index 5c0270b0e7db982a86b23fd5cbe8b98f738802f1..4d27bc99ce94a0967305a53eae466654e696f52b 100644 (file)
--- 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++
@@ -40,6 +40,7 @@ DEFINES := \
        -DTRUE=1 \
        -DFALSE=0 \
        -Dstricmp=strcasecmp \
+       -DBinIO_STDINT_HEADER="<stdint.h>" \
 
 INCLUDES := \
                        -I$(SRCDIR) \
@@ -71,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
@@ -217,6 +218,7 @@ GLUSRCS := \
        geom.c \
        memalloc.c \
        mesh.c \
+       mipmap.c \
        normal.c \
        priorityq.c \
        render.c \