Get VC++ building again
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19140 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp
index fc3d413..0c3caac 100644
--- a/lib/System/DynamicLibrary.cpp
+++ b/lib/System/DynamicLibrary.cpp
@@ -12,6 +12,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/System/DynamicLibrary.h"
+#include "llvm/Config/config.h"
// It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL
// license and special exception would cause all of LLVM to be placed under
@@ -19,7 +20,7 @@
// used, and obviously libtool is not used with Visual Studio. An entirely
// separate implementation is provided in win32/DynamicLibrary.cpp.
-#ifdef _WIN32
+#ifdef LLVM_ON_WIN32
#include "win32/DynamicLibrary.cpp"
@@ -148,4 +149,4 @@
return lt_dlsym((lt_dlhandle) handle, symbolName);
}
-#endif // _WIN32
\ No newline at end of file
+#endif // LLVM_ON_WIN32
diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 087d198..08192c2 100644
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -73,7 +73,7 @@
Name="Configure|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\Config\config.h "s/#undef PACKAGE_NAME/#define PACKAGE_NAME \"LLVM (win32 vc7.1)\"/;s/#undef PACKAGE_VERSION/#define PACKAGE_VERSION 1.4/;s/#undef HAVE_WINDOWS_H/#define HAVE_WINDOWS_H 1/;s/#undef HAVE_LIMITS_H/#define HAVE_LIMITS_H 1/;s/#undef HAVE_SYS_STAT_H/#define HAVE_SYS_STAT_H 1/;s/#undef HAVE_STDLIB_H/#define HAVE_STDLIB_H 1/;s/#undef HAVE_STDIO_H/#define HAVE_STDIO_H 1/;s/#undef HAVE_STRING_H/#define HAVE_STRING_H 1/;s/#undef SHLIBEXT/#define SHLIBEXT \".lib\"/;s/#undef error_t/#define error_t int/;s/#undef HAVE_ERRNO_H/#define HAVE_ERRNO_H 1/;s/#undef LTDL_DLOPEN_DEPLIBS/#define LTDL_DLOPEN_DEPLIBS 1/;s/#undef LTDL_OBJDIR/#define LTDL_OBJDIR \"_libs\"/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \"PATH\"/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \".dll\"/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \"\"/;"
+ CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\Config\config.h "s/#undef PACKAGE_NAME/#define PACKAGE_NAME \"LLVM (win32 vc7.1)\"/;s/#undef PACKAGE_VERSION/#define PACKAGE_VERSION 1.4/;s/#undef HAVE_WINDOWS_H/#define HAVE_WINDOWS_H 1/;s/#undef HAVE_LIMITS_H/#define HAVE_LIMITS_H 1/;s/#undef HAVE_SYS_STAT_H/#define HAVE_SYS_STAT_H 1/;s/#undef HAVE_STDLIB_H/#define HAVE_STDLIB_H 1/;s/#undef HAVE_STDIO_H/#define HAVE_STDIO_H 1/;s/#undef HAVE_STRING_H/#define HAVE_STRING_H 1/;s/#undef SHLIBEXT/#define SHLIBEXT \".lib\"/;s/#undef error_t/#define error_t int/;s/#undef HAVE_ERRNO_H/#define HAVE_ERRNO_H 1/;s/#undef LTDL_DLOPEN_DEPLIBS/#define LTDL_DLOPEN_DEPLIBS 1/;s/#undef LTDL_OBJDIR/#define LTDL_OBJDIR \"_libs\"/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \"PATH\"/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \".dll\"/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \"\"/;s/#undef LLVM_ON_WIN32/#define LLVM_ON_WIN32 1/;"
"
Outputs="$(ProjectDir)..\llvm\Config\config.h"/>
</FileConfiguration>
diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 10472ed..99d5508 100644
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -44,10 +44,8 @@
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist ..\..\lib\System\platform\DynamicLibrary.cpp echo #include "../win32/DynamicLibrary.cpp" >..\..\lib\System\platform\DynamicLibrary.cpp
-if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include "../win32/MappedFile.cpp" >..\..\lib\System\platform\MappedFile.cpp
+ CommandLine="if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include "../win32/MappedFile.cpp" >..\..\lib\System\platform\MappedFile.cpp
if not exist ..\..\lib\System\platform\Memory.cpp echo #include "../win32/Memory.cpp" >..\..\lib\System\platform\Memory.cpp
-if not exist ..\..\lib\System\platform\Path.cpp echo #include "../win32/Path.cpp" >..\..\lib\System\platform\Path.cpp
if not exist ..\..\lib\System\platform\Process.cpp echo #include "../win32/Process.cpp" >..\..\lib\System\platform\Process.cpp
if not exist ..\..\lib\System\platform\Program.cpp echo #include "../win32/Program.cpp" >..\..\lib\System\platform\Program.cpp
if not exist ..\..\lib\System\platform\Signals.cpp echo #include "../win32/Signals.cpp" >..\..\lib\System\platform\Signals.cpp
@@ -96,10 +94,8 @@
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist ..\..\lib\System\platform\DynamicLibrary.cpp echo #include "../win32/DynamicLibrary.cpp" >..\..\lib\System\platform\DynamicLibrary.cpp
-if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include "../win32/MappedFile.cpp" >..\..\lib\System\platform\MappedFile.cpp
+ CommandLine="if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include "../win32/MappedFile.cpp" >..\..\lib\System\platform\MappedFile.cpp
if not exist ..\..\lib\System\platform\Memory.cpp echo #include "../win32/Memory.cpp" >..\..\lib\System\platform\Memory.cpp
-if not exist ..\..\lib\System\platform\Path.cpp echo #include "../win32/Path.cpp" >..\..\lib\System\platform\Path.cpp
if not exist ..\..\lib\System\platform\Process.cpp echo #include "../win32/Process.cpp" >..\..\lib\System\platform\Process.cpp
if not exist ..\..\lib\System\platform\Program.cpp echo #include "../win32/Program.cpp" >..\..\lib\System\platform\Program.cpp
if not exist ..\..\lib\System\platform\Signals.cpp echo #include "../win32/Signals.cpp" >..\..\lib\System\platform\Signals.cpp