From ef14fa11a630d46efc9d6a17e61ab0df21ed4a99 Mon Sep 17 00:00:00 2001
From: Wolfgang Draxinger <Wolfgang.Draxinger@draxit.de>
Date: Thu, 3 Apr 2014 01:24:44 +0200
Subject: fixed makefile circular dependency

---
 test/Makefile  | 13 +++++++------
 test/layered.c |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'test')

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
-- 
cgit v1.2.3


From 05220bfef15dba26c63bede6ddf61423858b10de Mon Sep 17 00:00:00 2001
From: Wolfgang Draxinger <Wolfgang.Draxinger@draxit.de>
Date: Thu, 3 Apr 2014 01:32:28 +0200
Subject: fixed the layered test manifest

---
 test/Makefile |  2 +-
 test/manifest | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'test')

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
diff --git a/test/manifest b/test/manifest
index 3f616a1..f8b9bdc 100644
--- a/test/manifest
+++ b/test/manifest
@@ -1,13 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentAssembly>
-    </dependentAssembly>
-  </dependency>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+      <application> 
+        <!--This Id value indicates the application supports Windows Vista functionality -->
+          <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+        <!--This Id value indicates the application supports Windows 7 functionality-->
+          <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+        <!--This Id value indicates the application supports Windows 8 functionality-->
+          <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+        <!--This Id value indicates the application supports Windows 8.1 functionality-->
+          <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      </application> 
+  </compatibility>
+
+  <assemblyIdentity type="win32" 
+                    name="datenwolf.codesamples.wglarb_test_layered" 
+                    version="0.0.0.1" 
+  />
 </assembly>
-- 
cgit v1.2.3