From 043e6c54cacec60cf4a8089f1b01901461383777 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 25 Oct 2017 14:57:05 +0300 Subject: [PATCH] Reorder Windows platform defs. --- klib/src/platform/windows/gdiplus.def | 6 ++++++ klib/src/platform/windows/posix.def | 5 +++-- klib/src/platform/windows/windows.def | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 klib/src/platform/windows/gdiplus.def diff --git a/klib/src/platform/windows/gdiplus.def b/klib/src/platform/windows/gdiplus.def new file mode 100644 index 00000000000..2ae54e5cd25 --- /dev/null +++ b/klib/src/platform/windows/gdiplus.def @@ -0,0 +1,6 @@ +depends = windows +package = platform.gdiplus +headers = wtypes.h minwindef.h wtypes.h gdiplus/gdiplus.h +headerFilter = gdiplus/** +compilerOpts = -DUNICODE +linkerOpts = -lgdiplus \ No newline at end of file diff --git a/klib/src/platform/windows/posix.def b/klib/src/platform/windows/posix.def index 06fc13bd63d..01b0e2a4688 100644 --- a/klib/src/platform/windows/posix.def +++ b/klib/src/platform/windows/posix.def @@ -1,7 +1,8 @@ package = platform.posix -headers = stdio.h io.h math.h minwindef.h +headers = minwindef.h wtypesbase.h stdio.h io.h math.h compilerOpts = -DUNICODE -DWINVER=0x0601 -D_WIN32_WINNT=0x0601 -DWINAPI_FAMILY=3 \ - -D_INC_WINDOWS -Wno-incompatible-pointer-types -Wno-deprecated-declarations + -D_INC_WINDOWS -DRPC_NO_WINDOWS_H -DCOM_NO_WINDOWS_H \ + -Wno-incompatible-pointer-types -Wno-deprecated-declarations noStringConversion = send recv linkerOpts = -lWs2_32 diff --git a/klib/src/platform/windows/windows.def b/klib/src/platform/windows/windows.def index aada904b597..2dc6f8d0b84 100644 --- a/klib/src/platform/windows/windows.def +++ b/klib/src/platform/windows/windows.def @@ -1,5 +1,5 @@ package = platform.windows -headers = windows.h commctrl.h dwmapi.h shlobj.h shlwapi.h shobjidl.h \ +headers = wtypes.h minwindef.h windows.h commctrl.h dwmapi.h shlobj.h shlwapi.h shobjidl.h \ urlmon.h usp10.h uxtheme.h vfw.h wininet.h winsock2.h ws2tcpip.h ws2def.h compilerOpts = -DUNICODE -DWINVER=0x0601 -D_WIN32_WINNT=0x0601 -DWINAPI_FAMILY=3 \ -Wno-incompatible-pointer-types -Wno-deprecated-declarations