From f2afddbc5201ac7396373beb91f8a8d474013b08 Mon Sep 17 00:00:00 2001 From: robfram Date: Thu, 4 Jan 2018 15:31:08 +0100 Subject: [PATCH] Fix Issue#15303 FreeBSD compilation error in thekla_atlas due to wrong definition of NV_OS_LINUX instead NV_OS_FREEBSD --- modules/thekla_unwrap/SCsub | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/thekla_unwrap/SCsub b/modules/thekla_unwrap/SCsub index c57bf326eaf..d23ba10d4cc 100644 --- a/modules/thekla_unwrap/SCsub +++ b/modules/thekla_unwrap/SCsub @@ -1,5 +1,7 @@ #!/usr/bin/env python +import platform + Import('env') Import('env_modules') @@ -60,7 +62,13 @@ if env['builtin_thekla_atlas']: env_thekla_unwrap.Append(CXXFLAGS="-std=c++11") if env["platform"] == 'x11': - env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX", "-DPOSH_COMPILER_GCC"]) + # if not specifically one of the *BSD, then use LINUX as default + if platform.system() == "FreeBSD": + env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_FREEBSD", "-DPOSH_COMPILER_GCC"]) + elif platform.system() == "OpenBSD": + env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_OPENBSD", "-DPOSH_COMPILER_GCC"]) + else: + env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX", "-DPOSH_COMPILER_GCC"]) elif env["platform"] == 'osx': env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_DARWIN", "-DPOSH_COMPILER_GCC"]) elif env["platform"] == 'windows': @@ -69,6 +77,6 @@ if env['builtin_thekla_atlas']: else: env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_MINGW", "-DNV_CC_GNUC", "-DPOSH_COMPILER_GCC", "-U__STRICT_ANSI__"]) env.Append(LIBS=["dbghelp"]) - + # Godot source files env_thekla_unwrap.add_source_files(env.modules_sources, "*.cpp")