Opened 11 years ago

Closed 11 years ago

Last modified 2 years ago

#4700 closed defect (fixed)

MSVC compilation broken with r47595

Reported by: Templier Owned by: lordhoto
Priority: normal Component: Port: Win32
Version: Keywords: build
Cc: Game:

Description

Changes to main.cpp in 47595 broke compilation with Visual Studio. This seems to be caused by the inclusion of scummsys.h before including sdl.h & windows.h

Moving windows.h inclusion at the top of the file (and removing inclusion of scummsys.h) solves the problem.

Tested with - VC9 (using latest version of scummvm libs), freshly created project files - VC10 (converted project files from a few days ago)

Error messages:

sdl_config_win32.h(37): error C2371: 'int32_t' : redefinition; different basic types common\scummsys.h(224) : see declaration of 'int32_t'

sdl_config_win32.h(38): error C2371: 'uint32_t' : redefinition; different basic types common\scummsys.h(225) : see declaration of 'uint32_t'

winnt.h(1140): warning C4005: 'ARRAYSIZE' : macro redefinition common\util.h(62) : see previous definition of 'ARRAYSIZE'

Ticket imported from: #2895217. Ticket imported from: bugs/4700.

Attachments (1)

ScummVM-MSVC-r47975.patch (889 bytes ) - added by Templier 11 years ago.
Patch (against trunk)

Download all attachments as: .zip

Change History (3)

by Templier, 11 years ago

Attachment: ScummVM-MSVC-r47975.patch added

Patch (against trunk)

comment:1 by lordhoto, 11 years ago

Owner: set to lordhoto
Resolution: fixed
Status: newclosed

comment:2 by digitall, 2 years ago

Component: Port: Win32
Note: See TracTickets for help on using tickets.