diff options
author | Starla Insigna <starla4444@gmail.com> | 2013-08-25 14:41:26 -0400 |
---|---|---|
committer | Starla Insigna <starla4444@gmail.com> | 2013-08-25 14:41:26 -0400 |
commit | 387685d34e6c4ebee776a700a01fed4df05446be (patch) | |
tree | 1ce4f92037f77fbaee93225b44199cefa215f8f1 /Makefile | |
parent | 8ac5ac0365569cd8fab1ba6360a09e748a4fa299 (diff) | |
download | mazeoflife-387685d34e6c4ebee776a700a01fed4df05446be.tar.gz mazeoflife-387685d34e6c4ebee776a700a01fed4df05446be.tar.bz2 mazeoflife-387685d34e6c4ebee776a700a01fed4df05446be.zip |
Replaced internal resources with external ones for compatibility
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile index 27d70a9..8a9d3b5 100644 --- a/Makefile +++ b/Makefile | |||
@@ -10,8 +10,8 @@ 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 | RES = $(wildcard resources/*) | 12 | RES = $(wildcard resources/*) |
13 | CRES = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES))) | 13 | CRES = $(patsubst resources/%,build/%,$(RES)) |
14 | LINCCFL = `sdl-config --cflags` | 14 | LINCCFL = `sdl-config --cflags` -I/usr/local/Cellar/sdl_net/1.2.8/include/SDL/ -I/usr/local/Cellar/sdl_ttf/2.0.11/include/SDL/ |
15 | LINLDFL = `sdl-config --libs` -lSDL_ttf -lSDL_net | 15 | LINLDFL = `sdl-config --libs` -lSDL_ttf -lSDL_net |
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 |
17 | WINLDFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --libs` -lSDL_ttf -lSDL_net | 17 | WINLDFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --libs` -lSDL_ttf -lSDL_net |
@@ -27,13 +27,13 @@ clean: | |||
27 | rm -rdfv build | 27 | rm -rdfv build |
28 | 28 | ||
29 | $(LTARGET): $(SOURCES) $(CRES) | 29 | $(LTARGET): $(SOURCES) $(CRES) |
30 | $(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL) | 30 | $(CC) $(SOURCES) -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) $(CRES) build/winres.o | 35 | $(WTARGET): $(WINSRC) $(CRES) build/winres.o |
36 | $(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL) | 36 | $(WINCC) $(WINSRC) 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 | $(CRES): build/%.o: resources/% | 44 | $(CRES): build/%: resources/% |
45 | objcopy --input binary --output elf32-i386 -B i386 $? $@ | 45 | cp $? $@ |