josh/anaglym
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile updates: Lua flags trying pkg-config first, then lua-config, then hard-coded; added smpeg flags

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@287 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2010-06-23 16:13:17 +00:00
parent cfffe1873c
commit e3c19daa47
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -15,8 +15,21 @@ CDEPS := $(COBJS:.o=.dep)
CXXDEPS := $(CXXOBJS:.o=.dep) CXXDEPS := $(CXXOBJS:.o=.dep)
DEPS := $(CDEPS) $(CXXDEPS) DEPS := $(CDEPS) $(CXXDEPS)
LUAINCLUDE := $(shell pkg-config --cflags lua5.1) LUAINCLUDE := $(shell pkg-config --cflags lua5.1 2>/dev/null)
LUALIBS := $(shell pkg-config --libs lua5.1) 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) FTGLINCLUDE := $(shell pkg-config --cflags ftgl)
FTGLLIBS := $(shell pkg-config --libs 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) ODEINCLUDE := $(shell ode-config --cflags)
ODELIBS := $(shell ode-config --libs) ODELIBS := $(shell ode-config --libs)
SMPEGLIBS := $(shell smpeg-config --libs)
TOPLEVEL := $(shell pwd) TOPLEVEL := $(shell pwd)
ifeq ($(WINDOWS),1) ifeq ($(WINDOWS),1)
@ -41,7 +56,7 @@ endif
export CPPFLAGS := $(LUAINCLUDE) $(SDLINCLUDE) $(ODEINCLUDE) $(FTGLINCLUDE) -I$(TOPLEVEL) export CPPFLAGS := $(LUAINCLUDE) $(SDLINCLUDE) $(ODEINCLUDE) $(FTGLINCLUDE) -I$(TOPLEVEL)
export CFLAGS := $(CPPFLAGS) -O2 -Wall export CFLAGS := $(CPPFLAGS) -O2 -Wall
export CXXFLAGS := $(CFLAGS) export CXXFLAGS := $(CFLAGS)
export LDFLAGS := $(LUALIBS) $(ODELIBS) $(GLLIBS) $(WINDOWSLIBS) $(SDLLIBS) $(FTGLLIBS) export LDFLAGS := $(LUALIBS) $(ODELIBS) $(GLLIBS) $(WINDOWSLIBS) $(SDLLIBS) $(FTGLLIBS) $(SMPEGLIBS)
ifdef DEBUG ifdef DEBUG
CFLAGS += -g CFLAGS += -g