diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-09-29 19:23:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 19:23:29 +0200 |
| commit | c6f09fb97b48903f8d9d8d3b030b3b03d0a87e19 (patch) | |
| tree | c6412d869d44ea97f9fd4723f14cec7e1952c6e1 | |
| parent | f1c2c3038cc3fa57b266262615cb463760ac15ab (diff) | |
| parent | 8d31aba24e2572bb8d5fe91a486e09b1fa1cc0b6 (diff) | |
Merge pull request #22532 from moiman100/fix-windows-build
Fix build error: inconsistent use of tabs and spaces in indentation
| -rw-r--r-- | modules/thekla_unwrap/SCsub | 4 | ||||
| -rw-r--r-- | modules/xatlas_unwrap/SCsub | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/thekla_unwrap/SCsub b/modules/thekla_unwrap/SCsub index 8a04b50907..c47c760d5f 100644 --- a/modules/thekla_unwrap/SCsub +++ b/modules/thekla_unwrap/SCsub @@ -58,12 +58,12 @@ if env['builtin_thekla_atlas']: # upstream uses c++11 if (not env.msvc): - env_thekla_unwrap.Append(CXXFLAGS="-std=c++11") + env_thekla_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_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_FREEBSD", "-DPOSH_COMPILER_GCC"]) + 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: diff --git a/modules/xatlas_unwrap/SCsub b/modules/xatlas_unwrap/SCsub index 9272f5692e..ad364d5aaf 100644 --- a/modules/xatlas_unwrap/SCsub +++ b/modules/xatlas_unwrap/SCsub @@ -19,12 +19,12 @@ if env['builtin_xatlas']: # upstream uses c++11 if (not env.msvc): - env_xatlas_unwrap.Append(CXXFLAGS="-std=c++11") + 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(CCFLAGS=["-DNV_OS_FREEBSD", "-DPOSH_COMPILER_GCC"]) + env_xatlas_unwrap.Append(CCFLAGS=["-DNV_OS_FREEBSD", "-DPOSH_COMPILER_GCC"]) elif platform.system() == "OpenBSD": env_xatlas_unwrap.Append(CCFLAGS=["-DNV_OS_OPENBSD", "-DPOSH_COMPILER_GCC"]) else: |