diff options
author | Wolfgang Draxinger <Wolfgang.Draxinger@draxit.de> | 2014-08-19 12:21:57 +0200 |
---|---|---|
committer | Wolfgang Draxinger <Wolfgang.Draxinger@draxit.de> | 2014-08-19 12:21:57 +0200 |
commit | b8a7bb6d6b75ab708a9b0834183c91cc1c054b6c (patch) | |
tree | 6b1c283c124fc7cf7b9e6112a3ac8ae8c2c67949 /test | |
parent | d51dd7ca82cb65a10fcd7a3c0a0dc7420198986b (diff) | |
parent | de56626b62f4d6a9beee0589a45bc55bfcf9973e (diff) | |
download | wglarb-b8a7bb6d6b75ab708a9b0834183c91cc1c054b6c.tar.gz wglarb-b8a7bb6d6b75ab708a9b0834183c91cc1c054b6c.tar.bz2 |
mergedtest_shared
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile | 5 | ||||
-rw-r--r-- | test/layered.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/test/Makefile b/test/Makefile index 8c2092a..2b5a0b7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ TARGET64=x86_64-w64-mingw32 -TARGET32=mingw32 +TARGET32=i686-w64-mingw32 CC64=-$(TARGET64)-gcc CC32=-$(TARGET32)-gcc CFLAGS=-static-libgcc -static-libstdc++ -I.. @@ -25,7 +25,6 @@ layered64_rc.o: layered.rc manifest.xml layered32_rc.o: layered.rc manifest.xml $(WINDRES32) --input layered.rc --output layered32_rc.o - shared64.exe: shared.c shared64_rc.o ../wglarb.c $(CC64) $(CFLAGS) -o shared64.exe shared.c shared64_rc.o ../wglarb.c $(LIBS) -Wl,--subsystem,windows @@ -39,3 +38,5 @@ shared64_rc.o: layered.rc manifest.xml shared32_rc.o: layered.rc manifest.xml $(WINDRES32) --input shared.rc --output shared32_rc.o +clean: + rm *.o *.exe diff --git a/test/layered.c b/test/layered.c index 80f25cf..f28c677 100644 --- a/test/layered.c +++ b/test/layered.c @@ -304,12 +304,10 @@ int main(int argc, char *argv[]) if( 6 <= os_vinfo.dwMajorVersion ) {
hDwmAPI_DLL = LoadLibrary("dwmapi.dll");
if( hDwmAPI_DLL ) {
- impl_DwmEnableBlurBehindWindow =
- (procp_DwmEnableBlurBehindWindow)
+ *(PROC*)(&impl_DwmEnableBlurBehindWindow) =
GetProcAddress(hDwmAPI_DLL, "DwmEnableBlurBehindWindow");
- impl_DwmExtendFrameIntoClientArea =
- (procp_DwmExtendFrameIntoClientArea)
+ *(PROC*)(&impl_DwmExtendFrameIntoClientArea) =
GetProcAddress(hDwmAPI_DLL, "DwmExtendFrameIntoClientArea");
}
}
|