diff --git a/Makefile b/Makefile index 5efb8d9..2d37b6e 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,21 @@ CDEPS := $(COBJS:.o=.dep) CXXDEPS := $(CXXOBJS:.o=.dep) DEPS := $(CDEPS) $(CXXDEPS) -LUAINCLUDE := $(shell pkg-config --cflags lua5.1) -LUALIBS := $(shell pkg-config --libs lua5.1) +LUAINCLUDE := $(shell pkg-config --cflags lua5.1 2>/dev/null) +ifeq ($(strip $(LUAINCLUDE)),) +LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [ $$? -eq 0 ]; then lua-config --include; fi) +endif +ifeq ($(strip $(LUAINCLUDE)),) +LUAINCLUDE := -I/usr/include/lua5.1 +endif + +LUALIBS := $(shell pkg-config --libs lua5.1 2>/dev/null) +ifeq ($(strip $(LUALIBS)),) +LUALIBS := $(shell which lua-config >/dev/null 2>&1; if [ $$? -eq 0 ]; then lua-config --libs; fi) +endif +ifeq ($(strip $(LUALIBS)),) +LUALIBS := -llua5.1 +endif FTGLINCLUDE := $(shell pkg-config --cflags ftgl) FTGLLIBS := $(shell pkg-config --libs ftgl) @@ -27,6 +40,8 @@ SDLLIBS := -lSDL_image -lSDL_sound $(shell sdl-config --libs) ODEINCLUDE := $(shell ode-config --cflags) ODELIBS := $(shell ode-config --libs) +SMPEGLIBS := $(shell smpeg-config --libs) + TOPLEVEL := $(shell pwd) ifeq ($(WINDOWS),1) @@ -41,7 +56,7 @@ endif export CPPFLAGS := $(LUAINCLUDE) $(SDLINCLUDE) $(ODEINCLUDE) $(FTGLINCLUDE) -I$(TOPLEVEL) export CFLAGS := $(CPPFLAGS) -O2 -Wall export CXXFLAGS := $(CFLAGS) -export LDFLAGS := $(LUALIBS) $(ODELIBS) $(GLLIBS) $(WINDOWSLIBS) $(SDLLIBS) $(FTGLLIBS) +export LDFLAGS := $(LUALIBS) $(ODELIBS) $(GLLIBS) $(WINDOWSLIBS) $(SDLLIBS) $(FTGLLIBS) $(SMPEGLIBS) ifdef DEBUG CFLAGS += -g