From 387685d34e6c4ebee776a700a01fed4df05446be Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Sun, 25 Aug 2013 14:41:26 -0400 Subject: Replaced internal resources with external ones for compatibility --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 27d70a9..8a9d3b5 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ MODULES = $(patsubst %.cpp,%,$(FILES)) SOURCES = $(addsuffix .o,$(MODULES)) WINSRC = $(addsuffix win,$(SOURCES)) RES = $(wildcard resources/*) -CRES = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES))) -LINCCFL = `sdl-config --cflags` +CRES = $(patsubst resources/%,build/%,$(RES)) +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/ LINLDFL = `sdl-config --libs` -lSDL_ttf -lSDL_net WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS WINLDFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --libs` -lSDL_ttf -lSDL_net @@ -27,13 +27,13 @@ clean: rm -rdfv build $(LTARGET): $(SOURCES) $(CRES) - $(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL) + $(CC) $(SOURCES) -o $(LTARGET) $(LINLDFL) $(SOURCES): build/%.o: %.cpp $(HEADERS) $(CC) -c $< -o $@ $(LINCCFL) $(WTARGET): $(WINSRC) $(CRES) build/winres.o - $(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL) + $(WINCC) $(WINSRC) 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) $? $@ -$(CRES): build/%.o: resources/% - objcopy --input binary --output elf32-i386 -B i386 $? $@ +$(CRES): build/%: resources/% + cp $? $@ -- cgit 1.4.1