sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on linux 

Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498
This commit is contained in:
Youri Hubaut 2015-09-19 17:10:34 +02:00
parent 4176f1e019
commit a4032abe63
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/scripts/module/renderer.lua
View File

@ -13,7 +13,7 @@ files
} }
if (os.is("windows")) then if (os.is("windows")) then
excludes { "../src/Nazara/Renderer/Posix/*.hpp", "../src/Nazara/Renderer/Posix/*.cpp" } excludes { "../src/Nazara/Renderer/GLX/*.hpp", "../src/Nazara/Renderer/GLX/*.cpp" }
links "gdi32" links "gdi32"
links "opengl32" links "opengl32"
links "winmm" links "winmm"

2
build/scripts/module/utility.lua
View File

@ -13,7 +13,7 @@ files
links "freetype-s" links "freetype-s"
if (os.is("windows")) then if (os.is("windows")) then
excludes { "../src/Nazara/Utility/Posix/*.hpp", "../src/Nazara/Utility/Posix/*.cpp" } excludes { "../src/Nazara/Utility/X11/*.hpp", "../src/Nazara/Utility/X11/*.cpp" }
links "gdi32" links "gdi32"
else else
excludes { "../src/Nazara/Utility/Win32/*.hpp", "../src/Nazara/Utility/Win32/*.cpp" } excludes { "../src/Nazara/Utility/Win32/*.hpp", "../src/Nazara/Utility/Win32/*.cpp" }

3
include/Nazara/Prerequesites.hpp
View File

@ -117,9 +117,10 @@
#define _WIN32_WINNT NAZARA_WINNT #define _WIN32_WINNT NAZARA_WINNT
#endif #endif
#endif #endif
#elif defined(__linux__) #elif defined(__linux__) || defined(__unix__)
#define NAZARA_PLATFORM_LINUX #define NAZARA_PLATFORM_LINUX
#define NAZARA_PLATFORM_POSIX #define NAZARA_PLATFORM_POSIX
#define NAZARA_PLATFORM_X11
#define NAZARA_EXPORT __attribute__((visibility ("default"))) #define NAZARA_EXPORT __attribute__((visibility ("default")))
#define NAZARA_IMPORT __attribute__((visibility ("default"))) #define NAZARA_IMPORT __attribute__((visibility ("default")))

2
src/Nazara/Graphics/ColorBackground.cpp
View File

@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - Graphics module" // This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/ColorBackGround.hpp> #include <Nazara/Graphics/ColorBackground.hpp>
#include <Nazara/Renderer/Renderer.hpp> #include <Nazara/Renderer/Renderer.hpp>
#include <memory> #include <memory>
#include <Nazara/Graphics/Debug.hpp> #include <Nazara/Graphics/Debug.hpp>