From 5e67e0f93c2d92b7405f69b503f2e20a246bfaa0 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 5 Dec 2016 09:53:58 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeModules/nel.cmake                        | 2 +-
 code/nel/{src => include/nel}/ligo/ligo_material.h | 0
 code/nel/{src => include/nel}/ligo/transition.h    | 0
 code/nel/{src => include/nel}/ligo/zone_edge.h     | 0
 code/nel/src/ligo/ligo_material.cpp                | 2 +-
 code/nel/src/ligo/transition.cpp                   | 5 ++---
 code/nel/tools/3d/ligo/plugin_max/script.cpp       | 4 ++--
 7 files changed, 6 insertions(+), 7 deletions(-)
 rename code/nel/{src => include/nel}/ligo/ligo_material.h (100%)
 rename code/nel/{src => include/nel}/ligo/transition.h (100%)
 rename code/nel/{src => include/nel}/ligo/zone_edge.h (100%)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index ca47aec83..08f2f120e 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -852,7 +852,7 @@ MACRO(NL_SETUP_BUILD)
       ENDIF()
     ENDIF()
 
-    ADD_PLATFORM_FLAGS("-D_REENTRANT -fno-strict-aliasing")
+    ADD_PLATFORM_FLAGS("-D_REENTRANT")
 
     # hardening
     ADD_PLATFORM_FLAGS("-D_FORTIFY_SOURCE=2")
diff --git a/code/nel/src/ligo/ligo_material.h b/code/nel/include/nel/ligo/ligo_material.h
similarity index 100%
rename from code/nel/src/ligo/ligo_material.h
rename to code/nel/include/nel/ligo/ligo_material.h
diff --git a/code/nel/src/ligo/transition.h b/code/nel/include/nel/ligo/transition.h
similarity index 100%
rename from code/nel/src/ligo/transition.h
rename to code/nel/include/nel/ligo/transition.h
diff --git a/code/nel/src/ligo/zone_edge.h b/code/nel/include/nel/ligo/zone_edge.h
similarity index 100%
rename from code/nel/src/ligo/zone_edge.h
rename to code/nel/include/nel/ligo/zone_edge.h
diff --git a/code/nel/src/ligo/ligo_material.cpp b/code/nel/src/ligo/ligo_material.cpp
index d62f73be9..66212d5aa 100644
--- a/code/nel/src/ligo/ligo_material.cpp
+++ b/code/nel/src/ligo/ligo_material.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdligo.h"
-#include "ligo_material.h"
+#include "nel/ligo/ligo_material.h"
 
 // Ligo include
 #include "nel/ligo/ligo_error.h"
diff --git a/code/nel/src/ligo/transition.cpp b/code/nel/src/ligo/transition.cpp
index 47e204677..2dfa770d4 100644
--- a/code/nel/src/ligo/transition.cpp
+++ b/code/nel/src/ligo/transition.cpp
@@ -15,13 +15,12 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdligo.h"
-#include "transition.h"
+#include "nel/ligo/transition.h"
 
 // Ligo include
 #include "nel/ligo/zone_template.h"
 #include "nel/ligo/ligo_error.h"
-
-#include "ligo_material.h"
+#include "nel/ligo/ligo_material.h"
 
 namespace NLLIGO
 {
diff --git a/code/nel/tools/3d/ligo/plugin_max/script.cpp b/code/nel/tools/3d/ligo/plugin_max/script.cpp
index 36d5ff109..0fce6bbab 100644
--- a/code/nel/tools/3d/ligo/plugin_max/script.cpp
+++ b/code/nel/tools/3d/ligo/plugin_max/script.cpp
@@ -83,8 +83,8 @@ namespace std
 #include "nel/ligo/zone_template.h"
 #include "nel/ligo/ligo_config.h"
 #include "nel/ligo/ligo_error.h"
-#include "nel/../../src/ligo/ligo_material.h"
-#include "nel/../../src/ligo/transition.h"
+#include "nel/ligo/ligo_material.h"
+#include "nel/ligo/transition.h"
 #include "nel/ligo/zone_bank.h"
 
 #include "max_to_ligo.h"