This website works better with JavaScript.
Home
Help
Sign In
lolengine
/
lol
mirror of
https://github.com/lolengine/lol
Watch
1
Star
0
Fork
0
Code
Issues
0
Releases
0
Wiki
Activity
Browse Source
build: fix some issues with WIN32_LEAN_AND_MEAN redefinitions.
undefined
Sam Hocevar
9 years ago
parent
868a0502ef
commit
848344cc7b
12 changed files
with
21 additions
and
2 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-0
src/base/log.cpp
+1
-0
src/base/string.cpp
+2
-1
src/gpu/renderer.cpp
+2
-1
src/gpu/shader.cpp
+8
-0
src/lol/base/assert.h
+1
-0
src/scene.cpp
+1
-0
src/sys/file.cpp
+1
-0
src/sys/init.cpp
+1
-0
src/sys/timer.cpp
+1
-0
src/textureimage.cpp
+1
-0
src/tileset.cpp
+1
-0
src/video.cpp
+ 1
- 0
src/base/log.cpp
View File
@@ -17,6 +17,7 @@
#if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#endif
#if defined(__ANDROID__)
+ 1
- 0
src/base/string.cpp
View File
@@ -17,6 +17,7 @@
#if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#endif
#include <cstdarg>
+ 2
- 1
src/gpu/renderer.cpp
View File
@@ -18,8 +18,9 @@
# if defined USE_D3D9
# include <d3d9.h>
# endif
# define WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
1
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# undef near /* Fuck Microsoft */
# undef far /* Fuck Microsoft again */
#endif
+ 2
- 1
src/gpu/shader.cpp
View File
@@ -16,8 +16,9 @@
#include <cstdio>
#if defined _WIN32
# define WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
1
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# if defined USE_D3D9
# include <algorithm>
using std::min;
+ 8
- 0
src/lol/base/assert.h
View File
@@ -16,6 +16,14 @@
#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
{
+ 1
- 0
src/scene.cpp
View File
@@ -18,6 +18,7 @@
#if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN 1
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#endif
#include "lolgl.h"
+ 1
- 0
src/sys/file.cpp
View File
@@ -18,6 +18,7 @@
#if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN 1
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#else
# include <dirent.h>
#endif
+ 1
- 0
src/sys/init.cpp
View File
@@ -21,6 +21,7 @@
#if _WIN32
# define WIN32_LEAN_AND_MEAN
# include <direct.h>
# undef WIN32_LEAN_AND_MEAN
#endif
namespace lol
+ 1
- 0
src/sys/timer.cpp
View File
@@ -20,6 +20,7 @@
#elif _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
#elif HAVE_SDL_SDL_H
# include <SDL/SDL.h>
#else
+ 1
- 0
src/textureimage.cpp
View File
@@ -17,6 +17,7 @@
#if defined _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# if defined USE_D3D9
# define FAR
# define NEAR
+ 1
- 0
src/tileset.cpp
View File
@@ -19,6 +19,7 @@
#if defined _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# if defined USE_D3D9
# define FAR
# define NEAR
+ 1
- 0
src/video.cpp
View File
@@ -16,6 +16,7 @@
# endif
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef WIN32_LEAN_AND_MEAN
# undef near /* Fuck Microsoft */
# undef far /* Fuck Microsoft again */
#endif
Write
Preview
Loading…
Cancel
Save