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

Fix merge files

Browse Source 
Former-commit-id: 27058f380928319efcdd7af6104a776296b2093e
This commit is contained in:
Lynix
2015-08-21 22:43:53 +02:00
parent 505f1dbb03
commit 5888949bf9
2 changed files with 321 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Prerequesites.hpp
View File

@@ -121,7 +121,7 @@
#define NAZARA_EXPORT __attribute__((visibility ("default")))
#define NAZARA_IMPORT __attribute__((visibility ("default")))
/*#elif defined(__APPLE__) && defined(__MACH__)
#define NAZARA_API
#define NAZARA_CORE_API
#define NAZARA_PLATFORM_MACOSX
#define NAZARA_PLATFORM_POSIX*/
#else
@@ -129,7 +129,7 @@
#error This operating system is not fully supported by the Nazara Engine
#define NAZARA_PLATFORM_UNKNOWN
#define NAZARA_API
#define NAZARA_CORE_API
#endif
// Détection 64 bits