--- makefile.orig 2010-05-11 20:25:50.000000000 +0400 +++ makefile 2010-05-12 03:50:44.000000000 +0400 @@ -101,12 +101,10 @@ LDFLAGS += -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon -framework OpenAL LDFLAGS += ./libSDL-1.2.0.dylib ./libSDLmain-osx.a else - 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 - LD := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++ + LD := ${CXX} CFLAGS += -DPLATFORM_LINUX=1 - LDFLAGS += ./libSDL-1.2.so.0 -Wl,-rpath,\$$ORIGIN + LDFLAGS += `${SDL_CONFIG} --libs` ifeq ($(strip $(use_devil)),true) LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1 @@ -115,8 +113,10 @@ ifeq ($(strip $(use_fmod)),true) POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a else - LDFLAGS += ./libopenal.so.1 + LDFLAGS += -lopenal endif + + LDFLAGS += -lpng -ljpeg -lz -lGL -lGLU -lvorbisfile endif DEFINES += \ @@ -126,27 +126,25 @@ -DFALSE=0 \ -Dstricmp=strcasecmp \ -DBinIO_STDINT_HEADER="" \ + `${SDL_CONFIG} --cflags` \ + -D__linux__ INCLUDES += \ - -I$(SRCDIR) \ - -I$(SDLDIR)/include \ - -I./OpenGL/ \ - -I./OpenGL/GL \ + -I$(LOCALBASE)/include \ + -I$(LOCALBASE)/include/GL ifeq ($(strip $(use_devil)),true) DEFINES += -DUSE_DEVIL=1 INCLUDES += -I$(SRCDIR)/devil/include else DEFINES += -DZ_PREFIX=1 - INCLUDES += -I$(ZLIBDIR) -I$(LIBPNGDIR) -I$(JPEGLIBDIR) endif 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 -w +CFLAGS += -c $(INCLUDES) $(DEFINES) -fsigned-char -w ifeq ($(strip $(EXEEXT)),) @@ -330,15 +328,12 @@ VORBISSRCS := $(foreach f,$(VORBISSRCS),$(LIBVORBISDIR)/lib/$(f)) ifeq ($(strip $(macosx)),false) - SRCS += $(GLUSRCS) endif ifeq ($(strip $(use_devil)),false) - SRCS += $(PNGSRCS) $(JPEGSRCS) $(ZLIBSRCS) endif ifeq ($(strip $(use_fmod)),false) - SRCS += $(OGGSRCS) $(VORBISSRCS) endif OBJS := $(SRCS:.CC=.o)