From ad91edabff29d115b5701b7953d7b3eb92b3c14a Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 5 Dec 2016 09:24:26 +0100 Subject: [PATCH 1/3] Changed: Disable -fno-strict-aliasing (and fix all strict aliasing warnings) --HG-- branch : develop --- code/CMakeModules/nel.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index fb1543ce5..c52590ee2 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -851,7 +851,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") From 13ddbf39ef2dac42ec97048bcc0d8f65a6dada5b Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 5 Dec 2016 09:51:48 +0100 Subject: [PATCH 2/3] Changed: Moved other Ligo headers to include --HG-- branch : develop --- 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 3 files changed, 0 insertions(+), 0 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/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 From 83a64809c6188d7d4e781d2d6be0dd1fcbf4b1c5 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 5 Dec 2016 09:53:25 +0100 Subject: [PATCH 3/3] Changed: Ligo headers path --HG-- branch : develop --- 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 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) 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 . #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 . #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"