From ef14fa11a630d46efc9d6a17e61ab0df21ed4a99 Mon Sep 17 00:00:00 2001 From: Wolfgang Draxinger Date: Thu, 3 Apr 2014 01:24:44 +0200 Subject: fixed makefile circular dependency --- test/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'test/Makefile') diff --git a/test/Makefile b/test/Makefile index de20a97..91939ad 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,12 +1,13 @@ -CC=i686-w64-mingw32-gcc +TARGET=x86_64-w64-mingw32 +CC=-$(TARGET)-gcc CFLAGS=-static-libgcc -static-libstdc++ -I.. LIBS=-lopengl32 -lgdi32 -lkernel32 -WINDRES=i686-w64-mingw32-windres +WINDRES=$(TARGET)-windres -layered.exe: layered.c layered.rc.o - $(CC) $(CFLAGS) -o layered.exe layered.c layered.rc.o ../wglarb.c $(LIBS) -Wl,--subsystem,windows +layered.exe: layered.c layered_rc.o + $(CC) $(CFLAGS) -o layered.exe layered.c layered_rc.o ../wglarb.c $(LIBS) -Wl,--subsystem,windows -layered.rc.o: layered.rc - $(WINDRES) --input layered.rc --output layered.rc.o +layered_rc.o: layered.rc + $(WINDRES) --input layered.rc --output layered_rc.o -- cgit v1.2.3 From 05220bfef15dba26c63bede6ddf61423858b10de Mon Sep 17 00:00:00 2001 From: Wolfgang Draxinger Date: Thu, 3 Apr 2014 01:32:28 +0200 Subject: fixed the layered test manifest --- test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/Makefile') diff --git a/test/Makefile b/test/Makefile index 91939ad..cd497b0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -9,5 +9,5 @@ layered.exe: layered.c layered_rc.o $(CC) $(CFLAGS) -o layered.exe layered.c layered_rc.o ../wglarb.c $(LIBS) -Wl,--subsystem,windows -layered_rc.o: layered.rc +layered_rc.o: layered.rc manifest $(WINDRES) --input layered.rc --output layered_rc.o -- cgit v1.2.3