Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-12-05 09:53:58 +01:00
parent 5baaa3bcd9
commit 5e67e0f93c
7 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/CMakeModules/nel.cmake
View file

@ -852,7 +852,7 @@ MACRO(NL_SETUP_BUILD)
ENDIF() ENDIF()
ENDIF() ENDIF()
ADD_PLATFORM_FLAGS("-D_REENTRANT -fno-strict-aliasing") ADD_PLATFORM_FLAGS("-D_REENTRANT")
# hardening # hardening
ADD_PLATFORM_FLAGS("-D_FORTIFY_SOURCE=2") ADD_PLATFORM_FLAGS("-D_FORTIFY_SOURCE=2")

0
code/nel/src/ligo/ligo_material.h → code/nel/include/nel/ligo/ligo_material.h
View file

0
code/nel/src/ligo/transition.h → code/nel/include/nel/ligo/transition.h
View file

0
code/nel/src/ligo/zone_edge.h → code/nel/include/nel/ligo/zone_edge.h
View file

2
code/nel/src/ligo/ligo_material.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdligo.h" #include "stdligo.h"
#include "ligo_material.h" #include "nel/ligo/ligo_material.h"
// Ligo include // Ligo include
#include "nel/ligo/ligo_error.h" #include "nel/ligo/ligo_error.h"

5
code/nel/src/ligo/transition.cpp
View file

@ -15,13 +15,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdligo.h" #include "stdligo.h"
#include "transition.h" #include "nel/ligo/transition.h"
// Ligo include // Ligo include
#include "nel/ligo/zone_template.h" #include "nel/ligo/zone_template.h"
#include "nel/ligo/ligo_error.h" #include "nel/ligo/ligo_error.h"
#include "nel/ligo/ligo_material.h"
#include "ligo_material.h"
namespace NLLIGO namespace NLLIGO
{ {

4
code/nel/tools/3d/ligo/plugin_max/script.cpp
View file

@ -83,8 +83,8 @@ namespace std
#include "nel/ligo/zone_template.h" #include "nel/ligo/zone_template.h"
#include "nel/ligo/ligo_config.h" #include "nel/ligo/ligo_config.h"
#include "nel/ligo/ligo_error.h" #include "nel/ligo/ligo_error.h"
#include "nel/../../src/ligo/ligo_material.h" #include "nel/ligo/ligo_material.h"
#include "nel/../../src/ligo/transition.h" #include "nel/ligo/transition.h"
#include "nel/ligo/zone_bank.h" #include "nel/ligo/zone_bank.h"
#include "max_to_ligo.h" #include "max_to_ligo.h"