fix tile2bmp build under mingw. Provide alternatives for Microsoft-specific macros. Be consistent about slashes in gcc Makefile. Don't include shlwapi.h for any compiler.

This commit is contained in:
Dion Nicolaas
2015-04-16 22:36:06 +02:00
parent c8679c8e0e
commit 0c4573d82a
3 changed files with 51 additions and 8 deletions

View File

@@ -15,9 +15,8 @@
#include "mhmain.h"
#include "mhmap.h"
#ifndef __BORLANDC__
#include <shlwapi.h>
#else /* Borland redefines "boolean" in shlwapi.h so just use the little bit we need */
/* Borland and MinGW redefine "boolean" in shlwapi.h,
so just use the little bit we need */
typedef struct _DLLVERSIONINFO
{
DWORD cbSize;
@@ -34,7 +33,7 @@ typedef struct _DLLVERSIONINFO
typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
#endif
/* en of shlwapi.h */
/* Minimal common control library version
Version _WIN_32IE Platform/IE