1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e44f590..9bad9b2 100644
--- a/Makefile
+++ b/Makefile

@@ -9,8 +9,8 @@ HEADERS = $(wildcard *.h)
 MODULES = $(patsubst %.cpp,%,$(FILES))
 SOURCES = $(addsuffix .o,$(MODULES))
 WINSRC  = $(addsuffix win,$(SOURCES))
-IMAGES  = $(wildcard *.bmp)
+RES     = $(wildcard resources/*)
-CIMAGES = $(addprefix build/,$(IMAGES:.bmp=.bmp.o))
+CRES    = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES)))
 LINCCFL = `sdl-config --cflags`
 LINLDFL = `sdl-config --libs`
 WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS
@@ -26,14 +26,14 @@ init:
 clean:
        rm -rdfv build
-$(LTARGET): $(SOURCES) $(CIMAGES)
+$(LTARGET): $(SOURCES) $(CRES)
-        $(CC) $(SOURCES) $(CIMAGES) -o $(LTARGET) $(LINLDFL)
+        $(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL)
 $(SOURCES): build/%.o: %.cpp $(HEADERS)
        $(CC) -c $< -o $@ $(LINCCFL)
-$(WTARGET): $(WINSRC) $(CIMAGES) build/winres.o
+$(WTARGET): $(WINSRC) $(CRES) build/winres.o
-        $(WINCC) $(WINSRC) $(CIMAGES) build/winres.o -o $(WTARGET) $(WINLDFL)
+        $(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL)
 $(WINSRC): build/%.owin: %.cpp $(HEADERS)
        $(WINCC) -c $< -o $@ $(WINCCFL)
@@ -41,5 +41,5 @@ $(WINSRC): build/%.owin: %.cpp $(HEADERS)
 build/winres.o: winres.rc
        $(WINDRES) $? $@
-$(CIMAGES): build/%.bmp.o: %.bmp
+$(CRES): build/%.o: resources/%
        objcopy --input binary --output elf32-i386 -B i386 $? $@

diff --git a/Makefile b/Makefile index e44f590..9bad9b2 100644 --- a/Makefile +++ b/Makefile
@@ -9,8 +9,8 @@ HEADERS = $(wildcard *.h)
9	MODULES = $(patsubst %.cpp,%,$(FILES))	9	MODULES = $(patsubst %.cpp,%,$(FILES))
10	SOURCES = $(addsuffix .o,$(MODULES))	10	SOURCES = $(addsuffix .o,$(MODULES))
11	WINSRC = $(addsuffix win,$(SOURCES))	11	WINSRC = $(addsuffix win,$(SOURCES))
12	IMAGES = $(wildcard *.bmp)	12	RES = $(wildcard resources/*)
13	CIMAGES = $(addprefix build/,$(IMAGES:.bmp=.bmp.o))	13	CRES = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES)))
14	LINCCFL = `sdl-config --cflags`	14	LINCCFL = `sdl-config --cflags`
15	LINLDFL = `sdl-config --libs`	15	LINLDFL = `sdl-config --libs`
16	WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS	16	WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS
@@ -26,14 +26,14 @@ init:
26	clean:	26	clean:
27	rm -rdfv build	27	rm -rdfv build
28		28
29	$(LTARGET): $(SOURCES) $(CIMAGES)	29	$(LTARGET): $(SOURCES) $(CRES)
30	$(CC) $(SOURCES) $(CIMAGES) -o $(LTARGET) $(LINLDFL)	30	$(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL)
31		31
32	$(SOURCES): build/%.o: %.cpp $(HEADERS)	32	$(SOURCES): build/%.o: %.cpp $(HEADERS)
33	$(CC) -c $< -o $@ $(LINCCFL)	33	$(CC) -c $< -o $@ $(LINCCFL)
34		34
35	$(WTARGET): $(WINSRC) $(CIMAGES) build/winres.o	35	$(WTARGET): $(WINSRC) $(CRES) build/winres.o
36	$(WINCC) $(WINSRC) $(CIMAGES) build/winres.o -o $(WTARGET) $(WINLDFL)	36	$(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL)
37		37
38	$(WINSRC): build/%.owin: %.cpp $(HEADERS)	38	$(WINSRC): build/%.owin: %.cpp $(HEADERS)
39	$(WINCC) -c $< -o $@ $(WINCCFL)	39	$(WINCC) -c $< -o $@ $(WINCCFL)
@@ -41,5 +41,5 @@ $(WINSRC): build/%.owin: %.cpp $(HEADERS)
41	build/winres.o: winres.rc	41	build/winres.o: winres.rc
42	$(WINDRES) $? $@	42	$(WINDRES) $? $@
43		43
44	$(CIMAGES): build/%.bmp.o: %.bmp	44	$(CRES): build/%.o: resources/%
45	objcopy --input binary --output elf32-i386 -B i386 $? $@	45	objcopy --input binary --output elf32-i386 -B i386 $? $@