aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Draxinger <Wolfgang.Draxinger@draxit.de>2014-04-03 01:24:44 +0200
committerWolfgang Draxinger <Wolfgang.Draxinger@draxit.de>2014-04-03 01:24:44 +0200
commitef14fa11a630d46efc9d6a17e61ab0df21ed4a99 (patch)
treede02972b88dc428ad66226b56e3bc2d71b53618a
parent2ff87bd38f38eca0732c65666dee825b6795029a (diff)
downloadwglarb-ef14fa11a630d46efc9d6a17e61ab0df21ed4a99.tar.gz
wglarb-ef14fa11a630d46efc9d6a17e61ab0df21ed4a99.tar.bz2
fixed makefile circular dependency
-rw-r--r--test/Makefile13
-rw-r--r--test/layered.c2
2 files changed, 8 insertions, 7 deletions
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
diff --git a/test/layered.c b/test/layered.c
index 3260a06..1f016de 100644
--- a/test/layered.c
+++ b/test/layered.c
@@ -306,7 +306,7 @@ int main(int argc, char *argv[])
"Test", "TestWnd",
ViewProc,
hInstance,
-#if 0
+#if 1
WS_OVERLAPPEDWINDOW
#else
WS_POPUP