Do not use definitions from mongoose
This commit is contained in:
parent
675a1145a8
commit
7866d255d9
@ -1,4 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <mongoose.h>
|
||||||
|
|
||||||
namespace Components
|
namespace Components
|
||||||
{
|
{
|
||||||
|
@ -232,7 +232,7 @@ namespace Components
|
|||||||
{
|
{
|
||||||
auto* imageList = static_cast<Game::ImageList*>(data);
|
auto* imageList = static_cast<Game::ImageList*>(data);
|
||||||
|
|
||||||
assert(imageList->count < ARRAY_SIZE(imageList->image));
|
assert(imageList->count < ARRAYSIZE(imageList->image));
|
||||||
|
|
||||||
if (header.image->texture.basemap)
|
if (header.image->texture.basemap)
|
||||||
{
|
{
|
||||||
|
@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
#ifndef RC_INVOKED
|
#ifndef RC_INVOKED
|
||||||
|
|
||||||
//#define _HAS_CXX17 1
|
|
||||||
//#define _HAS_CXX20 1
|
|
||||||
#define VC_EXTRALEAN
|
#define VC_EXTRALEAN
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#define _CRT_SECURE_NO_WARNINGS
|
#define _CRT_SECURE_NO_WARNINGS
|
||||||
@ -17,6 +15,7 @@
|
|||||||
//#include <vld.h>
|
//#include <vld.h>
|
||||||
|
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
|
#include <WinSock2.h>
|
||||||
#include <timeapi.h>
|
#include <timeapi.h>
|
||||||
#include <shellapi.h>
|
#include <shellapi.h>
|
||||||
#include <WinInet.h>
|
#include <WinInet.h>
|
||||||
@ -80,7 +79,6 @@
|
|||||||
#include <gsl/gsl>
|
#include <gsl/gsl>
|
||||||
#include <json11.hpp>
|
#include <json11.hpp>
|
||||||
#include <tomcrypt.h>
|
#include <tomcrypt.h>
|
||||||
#include <mongoose.h>
|
|
||||||
#include <udis86.h>
|
#include <udis86.h>
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user