diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-25 13:53:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 13:53:29 +0200 |
| commit | f67c78d9cd777548c28b2adea67232c157b8187f (patch) | |
| tree | 004aabd45b46998e9488ffb440562634ba374e29 | |
| parent | 1cd8dda461091a0c0dec0b53146699c428ee8ab6 (diff) | |
| parent | eb155bc91abb4bdb293290fd4bc5ade12bc79669 (diff) | |
Merge pull request #28413 from akien-mga/xatlas-cleanup-thekla
SCons: Clean xatlas SCsub from thekla/poshlib defines
| -rw-r--r-- | modules/xatlas_unwrap/SCsub | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/modules/xatlas_unwrap/SCsub b/modules/xatlas_unwrap/SCsub index b8adfcb7df..7a40945f27 100644 --- a/modules/xatlas_unwrap/SCsub +++ b/modules/xatlas_unwrap/SCsub @@ -1,7 +1,5 @@ #!/usr/bin/env python -import platform - Import('env') Import('env_modules') @@ -21,23 +19,6 @@ if env['builtin_xatlas']: if (not env.msvc): env_xatlas_unwrap.Append(CXXFLAGS="-std=c++11") - if env["platform"] == 'x11': - # if not specifically one of the *BSD, then use LINUX as default - if platform.system() == "FreeBSD": - env_xatlas_unwrap.Append(CPPFLAGS=["-DNV_OS_FREEBSD", "-DPOSH_COMPILER_GCC"]) - elif platform.system() == "OpenBSD": - env_xatlas_unwrap.Append(CPPFLAGS=["-DNV_OS_OPENBSD", "-DPOSH_COMPILER_GCC"]) - else: - env_xatlas_unwrap.Append(CPPFLAGS=["-DNV_OS_LINUX", "-DPOSH_COMPILER_GCC"]) - elif env["platform"] == 'osx': - env_xatlas_unwrap.Append(CPPFLAGS=["-DNV_OS_DARWIN", "-DPOSH_COMPILER_GCC"]) - elif env["platform"] == 'windows': - if env.msvc: - env_xatlas_unwrap.Append(CPPFLAGS=["-DNV_OS_WIN32", "-DNV_CC_MSVC", "-DPOSH_COMPILER_MSVC" ]) - else: - env_xatlas_unwrap.Append(CPPFLAGS=["-DNV_OS_MINGW", "-DNV_CC_GNUC", "-DPOSH_COMPILER_GCC", "-U__STRICT_ANSI__"]) - env.Append(LIBS=["dbghelp"]) - env_thirdparty = env_xatlas_unwrap.Clone() env_thirdparty.disable_warnings() env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) |