diff options
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio71Generator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index e6f4bad..f4ae839 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -216,7 +216,6 @@ void cmGlobalVisualStudio6Generator::WriteDSWFile(std::ostream& fout, this->WriteDSWHeader(fout); // Get the home directory with the trailing slash -#undef GetCurrentDirectory std::string homedir = root->GetMakefile()->GetCurrentDirectory(); homedir += "/"; diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 3db033d..315b2aa 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -14,11 +14,12 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ +#include "windows.h" // this must be first to define GetCurrentDirectory #include "cmGlobalVisualStudio71Generator.h" #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" #include "cmake.h" -#include "windows.h" + cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator() @@ -48,7 +49,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout, this->WriteSLNHeader(fout); // Get the home directory with the trailing slash - #undef GetCurrentDirectory std::string homedir = root->GetMakefile()->GetCurrentDirectory(); homedir += "/"; bool doneAllBuild = false; diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 0e2cc33..d7301a0 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -14,12 +14,12 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ +#include "windows.h" // this must be first to define GetCurrentDirectory #include "cmGlobalVisualStudio7Generator.h" #include "cmLocalVisualStudio7Generator.h" #include "cmGeneratedFileStream.h" #include "cmMakefile.h" #include "cmake.h" -#include "windows.h" cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator() @@ -316,7 +316,6 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout, this->WriteSLNHeader(fout); // Get the home directory with the trailing slash -#undef GetCurrentDirectory std::string homedir = root->GetMakefile()->GetCurrentDirectory(); homedir += "/"; bool doneAllBuild = false; |