From aec88aafa24768a26a52b221700638e74f1628b3 Mon Sep 17 00:00:00 2001 From: Apjue Date: Fri, 26 Apr 2019 21:47:24 +0200 Subject: [PATCH 1/3] Fix Nazara version & fake tab --- include/Nazara/Prerequisites.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Prerequisites.hpp b/include/Nazara/Prerequisites.hpp index ddb2796fc..ca3fa889d 100644 --- a/include/Nazara/Prerequisites.hpp +++ b/include/Nazara/Prerequisites.hpp @@ -77,7 +77,7 @@ // Nazara version macro #define NAZARA_VERSION_MAJOR 0 -#define NAZARA_VERSION_MINOR 3 +#define NAZARA_VERSION_MINOR 4 #define NAZARA_VERSION_PATCH 0 #include @@ -136,7 +136,7 @@ // Détection 64 bits #if !defined(NAZARA_PLATFORM_x64) && (defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || defined(__ia64__) || defined(__ia64) || \ - defined(_M_IA64) || defined(__itanium__) || defined(__MINGW64__) || defined(_M_AMD64) || defined (_M_X64)) + defined(_M_IA64) || defined(__itanium__) || defined(__MINGW64__) || defined(_M_AMD64) || defined (_M_X64)) #define NAZARA_PLATFORM_x64 #endif From 1244ef13034c18afba114c0785171bc726318a5f Mon Sep 17 00:00:00 2001 From: Apjue Date: Fri, 26 Apr 2019 21:51:43 +0200 Subject: [PATCH 2/3] Fix french comment --- include/Nazara/Prerequisites.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Nazara/Prerequisites.hpp b/include/Nazara/Prerequisites.hpp index ca3fa889d..2414aba95 100644 --- a/include/Nazara/Prerequisites.hpp +++ b/include/Nazara/Prerequisites.hpp @@ -134,7 +134,7 @@ #define NAZARA_CORE_API #endif -// Détection 64 bits +// Detect 64 bits #if !defined(NAZARA_PLATFORM_x64) && (defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || defined(__ia64__) || defined(__ia64) || \ defined(_M_IA64) || defined(__itanium__) || defined(__MINGW64__) || defined(_M_AMD64) || defined (_M_X64)) #define NAZARA_PLATFORM_x64 From 1a8a5e612ea096a9976fc51434e8469c8a47943a Mon Sep 17 00:00:00 2001 From: Apjue Date: Sun, 12 May 2019 16:07:21 +0200 Subject: [PATCH 3/3] Set start project --- build/scripts/common.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index f5f50a9f8..4270fb6dd 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -58,6 +58,7 @@ function NazaraBuild:Execute() workspace("NazaraEngine") platforms(platformData) + startproject "DemoFirstScene" location(_ACTION) do