diff options
| author | Wolfgang Draxinger <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2014-05-24 00:00:32 +0200 |
|---|---|---|
| committer | Wolfgang Draxinger <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2014-05-24 00:00:32 +0200 |
| commit | 8cbe61ccd8e02d5fbdb7ccbe1ebaa1d01af63dc3 (patch) | |
| tree | c60f37a6ed426dbd4ee28248896885a1749c89cc /test | |
| parent | 54dc24db994e34861c47f72bc45280738afa3d86 (diff) | |
| parent | 05220bfef15dba26c63bede6ddf61423858b10de (diff) | |
| download | wglarb-8cbe61ccd8e02d5fbdb7ccbe1ebaa1d01af63dc3.tar.gz wglarb-8cbe61ccd8e02d5fbdb7ccbe1ebaa1d01af63dc3.tar.bz2 | |
Merge branch 'master' of github.com:datenwolf/wglarb
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 13 | ||||
| -rw-r--r-- | test/manifest | 30 |
2 files changed, 26 insertions, 17 deletions
diff --git a/test/Makefile b/test/Makefile index de20a97..cd497b0 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 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> |