diff options
| author | Ansariel Hiller <Ansariel@users.noreply.github.com> | 2024-09-13 16:28:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-13 17:28:48 +0300 |
| commit | 74205607b7e106f3b7566ef4a4b9c2fcdfa2f83e (patch) | |
| tree | 593cc976564d355a31c364ed2f715e30c86784ef /indra/llrender | |
| parent | c892ce9f5cf7582a1eb5ed27de117eedf3c2addc (diff) | |
Clean up Windows build (#2562)
* APR_DECLARE_STATIC and APU_DECLARE_STATIC gets already defined in APR.cmake
* Move both _CRT_SECURE_NO_WARNINGS and _WINSOCK_DEPRECATED_NO_WARNINGS definitions to 00-Common.cmake
* Always define WIN32_LEAN_AND_MEAN and include subset of Windows API by default
* Remove llwin32headerslean.h and remove unnecessary WIN32_LEAN_AND_MEAN definition handling in llwin32headers.h
* Clean up includes of Windows API headers
* Get rid of workaround to link against IPHLPAPI.lib in lluuid.cpp - this seems to have been an issue in the past that has been fixed
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglheaders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index c5e1ff3e23..3d4dc5e698 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -46,7 +46,7 @@ // LL_WINDOWS // windows gl headers depend on things like APIENTRY, so include windows. -#include "llwin32headerslean.h" +#include "llwin32headers.h" //---------------------------------------------------------------------------- #include <GL/gl.h> |