From 233aaf4bd50ec1b3fca4d4747d71bf36fb24cf62 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 20 Feb 2015 21:40:03 +0100 Subject: [PATCH] [DEFINE] nullptr is some case --- etk/types.h | 5 +++++ lutin_etk.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/etk/types.h b/etk/types.h index 5af337a..4af27d7 100644 --- a/etk/types.h +++ b/etk/types.h @@ -41,9 +41,14 @@ #endif #endif +#ifdef ETK_ENABLE_NULLPTR + #define nullptr NULL +#endif + #include #ifndef _WIN32 typedef float float_t; #endif + #endif diff --git a/lutin_etk.py b/lutin_etk.py index f3143be..d100027 100644 --- a/lutin_etk.py +++ b/lutin_etk.py @@ -46,6 +46,11 @@ def create(target): if target.name != "Windows": myModule.add_export_flag_LD("-ldl -rdynamic") + if target.config["compilator"] == "gcc" \ + and target.xx_version < 4007000: + myModule.add_export_flag_CC("-DETK_ENABLE_NULLPTR") + + if target.name=="Windows": None elif target.name=="Android":