Changeset 1313


Ignore:
Timestamp:
Apr 30, 2012, 11:48:55 AM (9 years ago)
Author:
sam
Message:

build: fix compilation on Windows by undefining the min and max macros
that WinDef.h insists on shoving down our throats.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lol/math/half.h

    r1311 r1313  
    2222namespace lol
    2323{
     24
     25/* This is OUR namespace. Don't let Windows headers fuck with it. */
     26#undef min
     27#undef max
    2428
    2529class half
  • trunk/src/lol/math/real.h

    r1311 r1313  
    1919#include <stdint.h>
    2020
     21namespace lol
     22{
     23
     24/* This is OUR namespace. Don't let Windows headers fuck with it. */
     25#undef min
     26#undef max
     27
    2128/* Avoid issues with NaCl headers */
    2229#undef log2
    23 
    24 namespace lol
    25 {
    2630
    2731/*
  • trunk/src/lol/math/vector.h

    r1311 r1313  
    2828namespace lol
    2929{
     30
     31/* This is OUR namespace. Don't let Windows headers fuck with it. */
     32#undef min
     33#undef max
    3034
    3135/* Some compilers do not support const members in anonymous unions. So
  • trunk/win32/lolcore.vcxproj.filters

    r1307 r1313  
    364364      <Filter>src\platform\xbox</Filter>
    365365    </ClInclude>
    366     <ClInclude Include="..\src\lol\debug.h" />
    367366    <ClInclude Include="..\src\gpu\indexbuffer.h">
    368367      <Filter>src\gpu</Filter>
     
    370369    <ClInclude Include="..\src\array.h">
    371370      <Filter>src</Filter>
     371    </ClInclude>
     372    <ClInclude Include="..\src\lol\debug.h">
     373      <Filter>src\lol</Filter>
    372374    </ClInclude>
    373375  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.