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

cleaned up Makefile a lot

Browse Source
This commit is contained in:
Josh Holtrop 2010-12-19 00:11:40 -05:00
parent 4cd5a61bc4
commit 96f62c237b
2 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgignore
View File

@ -1,6 +1,6 @@
glob:*.dep glob:*.dep
glob:*.o glob:*.o
^ag_lua.c$ ^ag_lua.cc$
^anaglym$ ^anaglym$
^sdl_keymap.cc$ ^sdl_keymap.cc$
glob:dist glob:dist

51
Makefile
View File

@ -7,14 +7,17 @@ else
PLATFORM := PLATFORM_WINDOWS PLATFORM := PLATFORM_WINDOWS
endif endif
TARGET := anaglym TARGET := anaglym
SOURCES := $(wildcard *.c) ag_lua.c SUBDIRS := WFObj PhyObj TextureCache OdeWorld
COBJS := $(patsubst %.c,%.o,$(SOURCES)) SUBDIR_OBJS := $(foreach sd,$(SUBDIRS),$(sd)/$(sd).o)
CXXOBJS := $(subst sdl_keymap.o,,$(patsubst %.cc,%.o,$(wildcard *.cc))) sdl_keymap.o CXXOBJS := $(patsubst %.cc,%.o,$(wildcard *.cc))
OBJS := $(COBJS) $(CXXOBJS) CXXOBJS := $(patsubst ag_lua.o,,$(CXXOBJS))
CDEPS := $(COBJS:.o=.dep) CXXOBJS := $(patsubst sdl_keymap.o,,$(CXXOBJS))
CXXDEPS := $(CXXOBJS:.o=.dep) OBJS := $(CXXOBJS) $(SUBDIR_OBJS) ag_lua.o sdl_keymap.o
DEPS := $(CDEPS) $(CXXDEPS) CXXDEPS := $(CXXOBJS:.o=.dep)
DEPS := $(CDEPS) $(CXXDEPS)
DEPS := $(patsubst ag_lua.dep,,$(DEPS))
DEPS := $(patsubst sdl_keymap.dep,,$(DEPS))
LUAINCLUDE := $(shell pkg-config --cflags lua5.1 2>/dev/null) LUAINCLUDE := $(shell pkg-config --cflags lua5.1 2>/dev/null)
ifeq ($(strip $(LUAINCLUDE)),) ifeq ($(strip $(LUAINCLUDE)),)
@ -68,34 +71,20 @@ endif
all: $(TARGET) all: $(TARGET)
$(TARGET): $(OBJS) wfobj/WFObj.o OdeWorld/OdeWorld.o PhyObj/PhyObj.o TextureCache/TextureCache.o $(TARGET): $(OBJS)
$(CXX) -o $@ $^ $(LDFLAGS) $(CXX) -o $@ $^ $(LDFLAGS)
ag_lua.c: ag.lua
xxd -i $< > $@
.PHONY: wfobj/WFObj.o
wfobj/WFObj.o:
$(MAKE) -C wfobj
.PHONY: OdeWorld/OdeWorld.o
OdeWorld/OdeWorld.o:
$(MAKE) -C OdeWorld
.PHONY: PhyObj/PhyObj.o
PhyObj/PhyObj.o:
$(MAKE) -C PhyObj
.PHONY: TextureCache/TextureCache.o
TextureCache/TextureCache.o:
$(MAKE) -C TextureCache
%.o: %.c %.o: %.c
$(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $< $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
%.o: %.cc %.o: %.cc
$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) $< $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) $<
ag_lua.cc: ag.lua
xxd -i $< > $@
ag_lua.o: ag_lua.cc
sdl_keymap.o: sdl_keymap.cc sdl_keymap.o: sdl_keymap.cc
sdl_keymap.cc: gen-sdl-keymap.pl sdl_keymap.cc: gen-sdl-keymap.pl
@ -142,11 +131,7 @@ install: dist
rsync -av dist/ $(install_dir) rsync -av dist/ $(install_dir)
clean: clean:
-rm -f *.o *.dep *~ $(TARGET) stdout.txt stderr.txt sdl_keymap.h sdl_keymap.cc -rm -f $(OBJS) $(DEPS) $(TARGET) stdout.txt stderr.txt sdl_keymap.cc ag_lua.cc
$(MAKE) -C wfobj clean
$(MAKE) -C TextureCache clean
$(MAKE) -C OdeWorld clean
$(MAKE) -C PhyObj clean
distclean: clean distclean: clean
-rm -rf dist -rm -rf dist