소스 검색

Merge pull request #22532 from moiman100/fix-windows-build

Fix build error: inconsistent use of tabs and spaces in indentation
Max Hilbrunner 7 년 전
부모
커밋
c6f09fb97b
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      modules/thekla_unwrap/SCsub
  2. 2 2
      modules/xatlas_unwrap/SCsub

+ 2 - 2
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:

+ 2 - 2
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: