[CALC] Explicitly link against comctl32. Patch by Carlo Bramini. CORE-10727

svn path=/trunk/; revision=74976
This commit is contained in:
Mark Jansen 2017-06-09 18:21:54 +00:00
parent c16f5dc411
commit 630bbc5421
2 changed files with 4 additions and 1 deletions

View file

@ -13,7 +13,7 @@ file(GLOB calc_rc_deps res/*.*)
add_rc_deps(resource.rc ${calc_rc_deps}) add_rc_deps(resource.rc ${calc_rc_deps})
add_executable(calc ${SOURCE} resource.rc) add_executable(calc ${SOURCE} resource.rc)
set_module_type(calc win32gui UNICODE) set_module_type(calc win32gui UNICODE)
add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32) add_importlibs(calc advapi32 comctl32 user32 shell32 gdi32 msvcrt kernel32)
if(MSVC) if(MSVC)
add_importlibs(calc ntdll) add_importlibs(calc ntdll)

View file

@ -4,6 +4,7 @@
#include <wingdi.h> #include <wingdi.h>
#include <winreg.h> #include <winreg.h>
#include <shellapi.h> #include <shellapi.h>
#include <commctrl.h>
#define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt) #define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)
@ -1785,6 +1786,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
MSG msg; MSG msg;
DWORD dwLayout; DWORD dwLayout;
InitCommonControls();
calc.hInstance = hInstance; calc.hInstance = hInstance;
calc.x_coord = -1; calc.x_coord = -1;