interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the Windows API #defines and #includes into its own file winapi.h so resources.rc can include it.

This commit is contained in:
Pietro Gagliardi 2015-05-31 11:12:29 -04:00
parent af20c0828c
commit 8d5131a5f6
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
redo/windows/GNUmakeinc.mk
View File

@ -34,7 +34,8 @@ osCFILES = \
osHFILES = \
windows/resources.h \
windows/uipriv_windows.h
windows/uipriv_windows.h \
windows/winapi.h
osRCFILES = \
windows/resources.rc

3
redo/windows/resources.rc
View File

@ -1,6 +1,5 @@
// 30 may 2015
//TODO#include "winapi.h"
#include <windows.h>
#include "winapi.h"
#include "resources.h"
// this is a UTF-8 file

27
redo/windows/uipriv_windows.h
View File

@ -1,30 +1,5 @@
// 6 january 2015
#define UNICODE
#define _UNICODE
#define STRICT
#define STRICT_TYPED_ITEMIDS
#define CINTERFACE
#define COBJMACROS
// see https://github.com/golang/go/issues/9916#issuecomment-74812211
#define INITGUID
// get Windows version right; right now Windows XP
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define _WIN32_WINDOWS 0x0501 /* according to Microsoft's winperf.h */
#define _WIN32_IE 0x0600 /* according to Microsoft's sdkddkver.h */
#define NTDDI_VERSION 0x05010000 /* according to Microsoft's sdkddkver.h */
#include <windows.h>
#include <commctrl.h>
#include <stdint.h>
#include <uxtheme.h>
#include <string.h>
#include <wchar.h>
#include <windowsx.h>
#include <vsstyle.h>
#include <vssym32.h>
#include <stdarg.h>
#include <oleacc.h>
#include <stdio.h>
#include "winapi.h"
#include "../out/ui.h"
#include "../ui_windows.h"
#include "../uipriv.h"

27
redo/windows/winapi.h Normal file
View File

@ -0,0 +1,27 @@
// 31 may 2015
#define UNICODE
#define _UNICODE
#define STRICT
#define STRICT_TYPED_ITEMIDS
#define CINTERFACE
#define COBJMACROS
// see https://github.com/golang/go/issues/9916#issuecomment-74812211
#define INITGUID
// get Windows version right; right now Windows XP
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define _WIN32_WINDOWS 0x0501 /* according to Microsoft's winperf.h */
#define _WIN32_IE 0x0600 /* according to Microsoft's sdkddkver.h */
#define NTDDI_VERSION 0x05010000 /* according to Microsoft's sdkddkver.h */
#include <windows.h>
#include <commctrl.h>
#include <stdint.h>
#include <uxtheme.h>
#include <string.h>
#include <wchar.h>
#include <windowsx.h>
#include <vsstyle.h>
#include <vssym32.h>
#include <stdarg.h>
#include <oleacc.h>
#include <stdio.h>