From a4032abe635244d1bae320edaa524527a768cfdb Mon Sep 17 00:00:00 2001 From: Youri Hubaut Date: Sat, 19 Sep 2015 17:10:34 +0200 Subject: [PATCH] Fix compilation on linux Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498 --- build/scripts/module/renderer.lua | 2 +- build/scripts/module/utility.lua | 2 +- include/Nazara/Prerequesites.hpp | 3 ++- src/Nazara/Graphics/ColorBackground.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/scripts/module/renderer.lua b/build/scripts/module/renderer.lua index 0acdb85a4..6e82baaf4 100644 --- a/build/scripts/module/renderer.lua +++ b/build/scripts/module/renderer.lua @@ -13,7 +13,7 @@ files } 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 "opengl32" links "winmm" diff --git a/build/scripts/module/utility.lua b/build/scripts/module/utility.lua index e6c25021e..9092ad28c 100644 --- a/build/scripts/module/utility.lua +++ b/build/scripts/module/utility.lua @@ -13,7 +13,7 @@ files links "freetype-s" 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" else excludes { "../src/Nazara/Utility/Win32/*.hpp", "../src/Nazara/Utility/Win32/*.cpp" } diff --git a/include/Nazara/Prerequesites.hpp b/include/Nazara/Prerequesites.hpp index 6bd2b68e7..801faf287 100644 --- a/include/Nazara/Prerequesites.hpp +++ b/include/Nazara/Prerequesites.hpp @@ -117,9 +117,10 @@ #define _WIN32_WINNT NAZARA_WINNT #endif #endif -#elif defined(__linux__) +#elif defined(__linux__) || defined(__unix__) #define NAZARA_PLATFORM_LINUX #define NAZARA_PLATFORM_POSIX + #define NAZARA_PLATFORM_X11 #define NAZARA_EXPORT __attribute__((visibility ("default"))) #define NAZARA_IMPORT __attribute__((visibility ("default"))) diff --git a/src/Nazara/Graphics/ColorBackground.cpp b/src/Nazara/Graphics/ColorBackground.cpp index 55c270a63..b9f11e95d 100644 --- a/src/Nazara/Graphics/ColorBackground.cpp +++ b/src/Nazara/Graphics/ColorBackground.cpp @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include