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

Fixed assorted build errors in the MSVC build. It works! And MinGW-w64 will need isolation awareness...

This commit is contained in:
Pietro Gagliardi 2015-11-27 19:59:46 -05:00
parent ba55b8ec7a
commit d29d36a6cd
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile.msvc
View File

@ -91,7 +91,7 @@ CFLAGS += \
LDFLAGS += \ LDFLAGS += \
/dll \ /dll \
/debug \ /debug \
/largeadressaware /nologo \ /largeaddressaware /nologo \
user32.lib kernel32.lib gdi32.lib comctl32.lib uxtheme.lib msimg32.lib comdlg32.lib d2d1.lib ole32.lib oleaut32.lib oleacc.lib uuid.lib user32.lib kernel32.lib gdi32.lib comctl32.lib uxtheme.lib msimg32.lib comdlg32.lib d2d1.lib ole32.lib oleaut32.lib oleacc.lib uuid.lib
OUT = $(OUTDIR)/$(NAME)$(SUFFIX) OUT = $(OUTDIR)/$(NAME)$(SUFFIX)

2
windows/datetimepicker.c
View File

@ -95,7 +95,7 @@ static void setDateTimeFormat(HWND hwnd)
n = _scwprintf(L"%s %s", date, time); n = _scwprintf(L"%s %s", date, time);
datetime = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]"); datetime = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]");
snwprintf(datetime, n + 1, L"%s %s", date, time); _snwprintf(datetime, n + 1, L"%s %s", date, time);
if (SendMessageW(hwnd, DTM_SETFORMAT, 0, (LPARAM) datetime) == 0) if (SendMessageW(hwnd, DTM_SETFORMAT, 0, (LPARAM) datetime) == 0)
logLastError("error applying format string to date/time picker in setDateTimeFormat()"); logLastError("error applying format string to date/time picker in setDateTimeFormat()");

2
windows/init.c
View File

@ -37,7 +37,7 @@ static const char *initerr(const char *message, const WCHAR *label, DWORD value)
wmessage = toUTF16(message); wmessage = toUTF16(message);
n = _scwprintf(initErrorFormat, initErrorArgs); n = _scwprintf(initErrorFormat, initErrorArgs);
wstr = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]"); wstr = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]");
snwprintf(wstr, n + 1, initErrorFormat, initErrorArgs); _snwprintf(wstr, n + 1, initErrorFormat, initErrorArgs);
str = toUTF8(wstr); str = toUTF8(wstr);
uiFree(wstr); uiFree(wstr);
if (hassysmsg) if (hassysmsg)

3
windows/winapi.h
View File

@ -17,6 +17,8 @@
#define _WIN32_IE 0x0700 /* according to Microsoft's sdkddkver.h */ #define _WIN32_IE 0x0700 /* according to Microsoft's sdkddkver.h */
#define NTDDI_VERSION 0x06000000 /* according to Microsoft's sdkddkver.h */ #define NTDDI_VERSION 0x06000000 /* according to Microsoft's sdkddkver.h */
#include <windows.h> #include <windows.h>
// Microsoft's resource compiler will segfault if we feed it headers it was not designed to handle
#ifndef RC_INVOKED
#include <commctrl.h> #include <commctrl.h>
#include <stdint.h> #include <stdint.h>
#include <uxtheme.h> #include <uxtheme.h>
@ -32,3 +34,4 @@
#include <math.h> #include <math.h>
#include <d2d1.h> #include <d2d1.h>
#include <float.h> #include <float.h>
#endif