From be12026a30dc5a509f32170eb7836e584399c455 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 13 Feb 2013 01:33:40 +0100 Subject: [PATCH] Fixed HardwareInfo not compiling Former-commit-id: 70f193cc041f431970c4dd6a0d9993ff5fedc659 --- build/scripts/common_examples.lua | 2 +- examples/HardwareInfo/build.lua | 2 -- examples/HardwareInfo/main.cpp | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/scripts/common_examples.lua b/build/scripts/common_examples.lua index ee6493ea1..3d1cdb2fe 100644 --- a/build/scripts/common_examples.lua +++ b/build/scripts/common_examples.lua @@ -12,7 +12,7 @@ location("../examples/build/" .. _ACTION) debugdir "../examples/bin" -includedirs { "../include", "../extlibs/lib/include" } +includedirs { "../include", "../extlibs/include" } libdirs "../lib" diff --git a/examples/HardwareInfo/build.lua b/examples/HardwareInfo/build.lua index bb998058d..63601943d 100644 --- a/examples/HardwareInfo/build.lua +++ b/examples/HardwareInfo/build.lua @@ -4,8 +4,6 @@ defines "NAZARA_RENDERER_OPENGL" files "main.cpp" -includedirs "../extlibs/include" - if (_OPTIONS["united"]) then configuration "DebugStatic" links "NazaraEngine-s-d" diff --git a/examples/HardwareInfo/main.cpp b/examples/HardwareInfo/main.cpp index 586067534..03e28e10c 100644 --- a/examples/HardwareInfo/main.cpp +++ b/examples/HardwareInfo/main.cpp @@ -27,7 +27,7 @@ int main() // 2) Le concepteur du processeur, accessible via une énumération (GetProcessorVendor) ou une chaîne de caractère (GetProcessorVendorName) // 3) Le nombre de processeurs, alias bien souvent le nombre de coeurs, cette valeur est renvoyée par l'OS (Le SMT multiplie donc la valeur réelle) oss << "Identification: " << NzHardwareInfo::GetProcessorBrandString() << std::endl; - oss << "Vendeur: " << NzHardwareInfo::GetProcessorVendorName() << std::endl; + oss << "Concepteur: " << NzHardwareInfo::GetProcessorVendorName() << std::endl; oss << "Nombre de coeurs: " << NzHardwareInfo::GetProcessorCount() << std::endl; oss << std::endl; @@ -64,7 +64,7 @@ int main() // 2) La chaîne d'identification du concepteur ("Vendor name") // 3) La version d'OpenGL oss << "Identification: " << NzOpenGL::GetRendererName() << std::endl; - oss << "Vendeur: " << NzOpenGL::GetVendorName() << std::endl; + oss << "Concepteur: " << NzOpenGL::GetVendorName() << std::endl; oss << "Version d'OpenGL: " << openglVersion/100 << '.' << openglVersion%100 << std::endl; oss << std::endl;