Bladeren bron

build: fix some issues with WIN32_LEAN_AND_MEAN redefinitions.

undefined
Sam Hocevar 9 jaren geleden
bovenliggende
commit
848344cc7b
12 gewijzigde bestanden met toevoegingen van 21 en 2 verwijderingen
  1. +1
    -0
      src/base/log.cpp
  2. +1
    -0
      src/base/string.cpp
  3. +2
    -1
      src/gpu/renderer.cpp
  4. +2
    -1
      src/gpu/shader.cpp
  5. +8
    -0
      src/lol/base/assert.h
  6. +1
    -0
      src/scene.cpp
  7. +1
    -0
      src/sys/file.cpp
  8. +1
    -0
      src/sys/init.cpp
  9. +1
    -0
      src/sys/timer.cpp
  10. +1
    -0
      src/textureimage.cpp
  11. +1
    -0
      src/tileset.cpp
  12. +1
    -0
      src/video.cpp

+ 1
- 0
src/base/log.cpp Bestand weergeven

@@ -17,6 +17,7 @@
#if defined(_WIN32) #if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#endif #endif


#if defined(__ANDROID__) #if defined(__ANDROID__)


+ 1
- 0
src/base/string.cpp Bestand weergeven

@@ -17,6 +17,7 @@
#if defined(_WIN32) #if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#endif #endif


#include <cstdarg> #include <cstdarg>


+ 2
- 1
src/gpu/renderer.cpp Bestand weergeven

@@ -18,8 +18,9 @@
# if defined USE_D3D9 # if defined USE_D3D9
# include <d3d9.h> # include <d3d9.h>
# endif # endif
# define WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN 1
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# undef near /* Fuck Microsoft */ # undef near /* Fuck Microsoft */
# undef far /* Fuck Microsoft again */ # undef far /* Fuck Microsoft again */
#endif #endif


+ 2
- 1
src/gpu/shader.cpp Bestand weergeven

@@ -16,8 +16,9 @@
#include <cstdio> #include <cstdio>


#if defined _WIN32 #if defined _WIN32
# define WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN 1
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# if defined USE_D3D9 # if defined USE_D3D9
# include <algorithm> # include <algorithm>
using std::min; using std::min;


+ 8
- 0
src/lol/base/assert.h Bestand weergeven

@@ -16,6 +16,14 @@


#include <cstdlib> #include <cstdlib>


#if defined _WIN32
# define WIN32_LEAN_AND_MEAN 1
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# undef near /* Fuck Microsoft */
# undef far /* Fuck Microsoft again */
#endif

namespace lol namespace lol
{ {




+ 1
- 0
src/scene.cpp Bestand weergeven

@@ -18,6 +18,7 @@
#if defined(_WIN32) #if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN 1 # define WIN32_LEAN_AND_MEAN 1
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#endif #endif


#include "lolgl.h" #include "lolgl.h"


+ 1
- 0
src/sys/file.cpp Bestand weergeven

@@ -18,6 +18,7 @@
#if defined(_WIN32) #if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN 1 # define WIN32_LEAN_AND_MEAN 1
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#else #else
# include <dirent.h> # include <dirent.h>
#endif #endif


+ 1
- 0
src/sys/init.cpp Bestand weergeven

@@ -21,6 +21,7 @@
#if _WIN32 #if _WIN32
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <direct.h> # include <direct.h>
# undef WIN32_LEAN_AND_MEAN
#endif #endif


namespace lol namespace lol


+ 1
- 0
src/sys/timer.cpp Bestand weergeven

@@ -20,6 +20,7 @@
#elif _WIN32 #elif _WIN32
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#elif HAVE_SDL_SDL_H #elif HAVE_SDL_SDL_H
# include <SDL/SDL.h> # include <SDL/SDL.h>
#else #else


+ 1
- 0
src/textureimage.cpp Bestand weergeven

@@ -17,6 +17,7 @@
#if defined _WIN32 #if defined _WIN32
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# if defined USE_D3D9 # if defined USE_D3D9
# define FAR # define FAR
# define NEAR # define NEAR


+ 1
- 0
src/tileset.cpp Bestand weergeven

@@ -19,6 +19,7 @@
#if defined _WIN32 #if defined _WIN32
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# if defined USE_D3D9 # if defined USE_D3D9
# define FAR # define FAR
# define NEAR # define NEAR


+ 1
- 0
src/video.cpp Bestand weergeven

@@ -16,6 +16,7 @@
# endif # endif
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# undef near /* Fuck Microsoft */ # undef near /* Fuck Microsoft */
# undef far /* Fuck Microsoft again */ # undef far /* Fuck Microsoft again */
#endif #endif


Laden…
Annuleren
Opslaan