From 6c9c8e547e8e983eab73c81fbff8f1785102c736 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sat, 22 Dec 2012 21:24:41 +0000 Subject: [PATCH] build: renormalise a lot of files. --- .gitattributes | 25 +- src/lolcore.vcxproj | 1288 +++++++++++++++++----------------- test/BtPhysTest.vcxproj | 166 ++--- test/benchsuite.vcxproj | 136 ++-- test/math/remez.vcxproj | 300 ++++---- test/testsuite.vcxproj | 156 ++-- tutorial/01_triangle.vcxproj | 134 ++-- tutorial/02_cube.vcxproj | 134 ++-- tutorial/03_noise.vcxproj | 136 ++-- tutorial/04_texture.vcxproj | 136 ++-- tutorial/05_easymesh.vcxproj | 130 ++-- tutorial/08_fbo.vcxproj | 134 ++-- tutorial/11_fractal.vcxproj | 134 ++-- 13 files changed, 1510 insertions(+), 1499 deletions(-) diff --git a/.gitattributes b/.gitattributes index 97feebe9..1c17e6c8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,19 @@ -# Visual Studio wants crlf -*.sln eol=crlf -*.csproj eol=crlf -*.vcxproj eol=crlf -# Vim doesn't like CRLF -*.vim -text +# Visual Studio wants crlf, but if we do so, git will +# normalise files and git-svn will push LF files to SVN, +# so we revert back to binary. +*.sln -text +*.csproj -text +*.vcxproj -text + +# Vim doesn't like CRLF, even on Windows +*.vim eol=lf # Bison doesn't like CRLF -external/*/share/bison/* -text +external/*/share/bison/* eol=lf + +# Source files should be normalised in the repository +*.c eol=lf +*.cpp eol=lf +*.cc eol=lf +*.h eol=lf +*.hh eol=lf +*.lolfx eol=lf diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj index 78cf62d4..9b8a63eb 100644 --- a/src/lolcore.vcxproj +++ b/src/lolcore.vcxproj @@ -1,644 +1,644 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - StaticLibrary - Win32Proj - - - - true - MultiByte - - - true - MultiByte - - - MultiByte - - - MultiByte - - - false - true - MultiByte - - - false - true - MultiByte - - - true - MultiByte - - - true - MultiByte - - - - - - - - - - - - - _LIB;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} + StaticLibrary + Win32Proj + + + + true + MultiByte + + + true + MultiByte + + + MultiByte + + + MultiByte + + + false + true + MultiByte + + + false + true + MultiByte + + + true + MultiByte + + + true + MultiByte + + + + + + + + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/BtPhysTest.vcxproj b/test/BtPhysTest.vcxproj index a2625a33..468afa48 100644 --- a/test/BtPhysTest.vcxproj +++ b/test/BtPhysTest.vcxproj @@ -1,84 +1,84 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - - true - - - - {ee203b88-44cf-4859-9d42-7a1f43fecb52} - Application - Win32Proj - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + + true + + + + {ee203b88-44cf-4859-9d42-7a1f43fecb52} + Application + Win32Proj + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/benchsuite.vcxproj b/test/benchsuite.vcxproj index b489ef7d..3e145b86 100644 --- a/test/benchsuite.vcxproj +++ b/test/benchsuite.vcxproj @@ -1,69 +1,69 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {B1E10086-A1DA-401A-834D-969C9DBB5CC1} - Application - Win32Proj - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {B1E10086-A1DA-401A-834D-969C9DBB5CC1} + Application + Win32Proj + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/math/remez.vcxproj b/test/math/remez.vcxproj index c80de071..ce2a41e9 100644 --- a/test/math/remez.vcxproj +++ b/test/math/remez.vcxproj @@ -1,151 +1,151 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A2767731-6FBF-442C-900F-301D095516E7} - Win32Proj - remez - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - true - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A2767731-6FBF-442C-900F-301D095516E7} + Win32Proj + remez + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/testsuite.vcxproj b/test/testsuite.vcxproj index 3263513e..dc93dd80 100644 --- a/test/testsuite.vcxproj +++ b/test/testsuite.vcxproj @@ -1,78 +1,78 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {80F81C11-8DA2-4990-91CB-9807783BA46E} - Application - Win32Proj - - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {80F81C11-8DA2-4990-91CB-9807783BA46E} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/tutorial/01_triangle.vcxproj b/tutorial/01_triangle.vcxproj index f36ae903..9d71b98d 100644 --- a/tutorial/01_triangle.vcxproj +++ b/tutorial/01_triangle.vcxproj @@ -1,68 +1,68 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {b92abadc-45be-4cc5-b724-9426053123a1} - Application - Win32Proj - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {b92abadc-45be-4cc5-b724-9426053123a1} + Application + Win32Proj + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorial/02_cube.vcxproj b/tutorial/02_cube.vcxproj index a02a9734..77af196a 100644 --- a/tutorial/02_cube.vcxproj +++ b/tutorial/02_cube.vcxproj @@ -1,68 +1,68 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {7b083da2-fe08-4f6d-bfdd-195d5c2783eb} - Application - Win32Proj - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {7b083da2-fe08-4f6d-bfdd-195d5c2783eb} + Application + Win32Proj + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorial/03_noise.vcxproj b/tutorial/03_noise.vcxproj index 92052e0d..bb95d0f1 100644 --- a/tutorial/03_noise.vcxproj +++ b/tutorial/03_noise.vcxproj @@ -1,68 +1,68 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {b0a53d75-cbb4-4fdf-93ac-2d12a79ada0e} - Application - Win32Proj - - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {b0a53d75-cbb4-4fdf-93ac-2d12a79ada0e} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/tutorial/04_texture.vcxproj b/tutorial/04_texture.vcxproj index 231d76fb..23676699 100644 --- a/tutorial/04_texture.vcxproj +++ b/tutorial/04_texture.vcxproj @@ -1,68 +1,68 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {834852db-edb6-4fd0-bcf9-45cd01126962} - Application - Win32Proj - - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {834852db-edb6-4fd0-bcf9-45cd01126962} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/tutorial/05_easymesh.vcxproj b/tutorial/05_easymesh.vcxproj index 1eaf6776..7f6e8dc2 100644 --- a/tutorial/05_easymesh.vcxproj +++ b/tutorial/05_easymesh.vcxproj @@ -1,65 +1,65 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {1c5b8702-290c-42da-aa9e-671348f5b747} - Application - Win32Proj - - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {1c5b8702-290c-42da-aa9e-671348f5b747} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/tutorial/08_fbo.vcxproj b/tutorial/08_fbo.vcxproj index 70ee22cc..94cf5507 100644 --- a/tutorial/08_fbo.vcxproj +++ b/tutorial/08_fbo.vcxproj @@ -1,68 +1,68 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} - Application - Win32Proj - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} + Application + Win32Proj + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tutorial/11_fractal.vcxproj b/tutorial/11_fractal.vcxproj index 02cb1fcf..bab6ffc6 100644 --- a/tutorial/11_fractal.vcxproj +++ b/tutorial/11_fractal.vcxproj @@ -1,68 +1,68 @@ - - - - - Debug - PS3 - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - PS3 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {6bf81b39-edc2-4227-9992-c2d8abea95af} - Application - Win32Proj - - - - - - - - - - - - - - - - + + + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {6bf81b39-edc2-4227-9992-c2d8abea95af} + Application + Win32Proj + + + + + + + + + + + + + + + + \ No newline at end of file