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

Merge pull request #203 from Apjue/version 

Fix Nazara version & fake tab
This commit is contained in:
Jérôme Leclercq 2019-05-20 17:53:28 +02:00 committed by GitHub
parent b88c9b2cec 1a8a5e612e
commit 5a893a1124
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/scripts/common.lua
View File

@ -58,6 +58,7 @@ function NazaraBuild:Execute()
workspace("NazaraEngine")
platforms(platformData)
startproject "DemoFirstScene"
location(_ACTION)
do

6
include/Nazara/Prerequisites.hpp
View File

@ -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 <Nazara/Core/Config.hpp>
@ -134,9 +134,9 @@
#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))
defined(_M_IA64) || defined(__itanium__) || defined(__MINGW64__) || defined(_M_AMD64) || defined (_M_X64))
#define NAZARA_PLATFORM_x64
#endif