From de7fecbd7685238c0b978aae78bc647a15545eea Mon Sep 17 00:00:00 2001 From: Allanis Date: Tue, 31 Dec 2013 07:19:53 +0000 Subject: [PATCH] [Change] Removed many external commands from makefile. --- bin/Makefile | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 9d365ec..71e2bce 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -4,6 +4,7 @@ DEBUG := 1 OS := LINUX #OS := WIN32 +#OS := MACOS #CC = clang @@ -16,8 +17,7 @@ VERSIONFILE = VERSION # OBJECTS. APPNAME := Lephisto -OBJS := $(shell find ../src/ -name '*.c' -print) -OBJS := $(OBJS:%.c=%.o) +OBJS := $(patsubst %.c, %.o, $(wildcard ../src/*.c)) # CFLAGS CLUA := -I../lib/lua @@ -66,13 +66,25 @@ LDFLAGS += -pg endif # DATA. -DATA_AI := $(shell find ../scripts/ai/ -name '*.lua') -DATA_GFX := $(shell find ../gfx/ -name '*.png') -DATA_XML := $(shell find ../dat/ -name '*.xml' -o -name '*.ttf') -DATA_SND := $(shell find ../snd/ -name '*.ogg' -o -name '*.wav') ../snd/music.lua -DATA_MISN := $(shell find ../dat/missions/ -name '*.lua') -DATA := data -DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) +DATA_AI := $(wildcard ../scripts/ai/*.lua) \ + $(wildcard ../scripts/ai/include/*.lua) \ + $(wildcard ../scipts/ai/tpl/*.lua) +DATA_GFX := $(wildcard ../gfx/*.png) \ + $(wildcard ../gfx/gui/*.png) \ + $(wildcard ../gfx/logo/*.png) \ + $(wildcard ../gfx/outfit/space/*.png) \ + $(wildcard ../gfx/outfit/store/*.png) \ + $(wildcard ../gfx/planet/exterior/*.png) \ + $(wildcard ../gfx/planet/space/*.png) \ + $(wildcard ../gfx/ship/*.png) \ + $(wildcard ../gfx/spfx/*.png) +DATA_XML := $(wildcard ../dat/*.xml) $(wildcard ../dat/*.ttf) +DATA_SND := $(wildcard ../snd/music/*.ogg) \ + $(wildcard ../snd/sounds/*.wav) \ + ../snd/music.lua +DATA_MISN := $(wildcard ../dat/missions/*.lua) +DATA := data +DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) # TARGETS. .PHONY: all clean purge