mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-10 01:09:34 +00:00
Merge with develop
This commit is contained in:
parent
5baaa3bcd9
commit
5e67e0f93c
7 changed files with 6 additions and 7 deletions
|
@ -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")
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue