X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=makefile;h=2719849431c66d7203f874efed313a544ac6f517;hb=7c0929d838b89843ccca9d679b3963ff8bdd35b8;hp=b8c6c40a4f1bb06b6cae1f4a7113d243a463c298;hpb=964f8ad65f4b76b55153b6787c2e228c0963e093;p=lugaru.git diff --git a/makefile b/makefile index b8c6c40..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