[llvm-commits] CVS: llvm/win32/Configure/Configure.vcproj

[Jeff Cohen]

Changes in directory llvm/win32/Configure:

Configure.vcproj updated: 1.10 -> 1.11
---
Log message:

Update Windows version of config.h to note availability of floor/floorf/ceil/ceilf.
Also pulled Windows-specific modifications to config.h.in to a separate file, so
that changes to it trigger regeneration of config.h (which doesn't happen when the
custom build step for it changes).


---
Diffs of the changes:  (+10 -22)

 Configure.vcproj |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)


Index: llvm/win32/Configure/Configure.vcproj
diff -u llvm/win32/Configure/Configure.vcproj:1.10 llvm/win32/Configure/Configure.vcproj:1.11
--- llvm/win32/Configure/Configure.vcproj:1.10	Wed Oct 26 20:10:37 2005
+++ llvm/win32/Configure/Configure.vcproj	Thu Jan 19 22:34:45 2006
@@ -74,24 +74,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\Config\config.h"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\Config\config.h
-echo #define PACKAGE_NAME "LLVM (win32 vc7.1)" >>$(ProjectDir)..\llvm\Config\config.h
-echo #define PACKAGE_VERSION 1.4 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_WINDOWS_H 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_LIMITS_H 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_SYS_STAT_H 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_STDLIB_H 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_STDIO_H 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_STRING_H 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define SHLIBEXT ".lib" >>$(ProjectDir)..\llvm\Config\config.h
-echo #define error_t int >>$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_ERRNO_H 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_DLOPEN_DEPLIBS 1 >>$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_OBJDIR "_libs" >>$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_SHLIBPATH_VAR "PATH" >>$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_SHLIB_EXT ".dll" >>$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_SYSSEARCHPATH "" >>$(ProjectDir)..\llvm\Config\config.h
-echo #define LLVM_ON_WIN32 1 >>$(ProjectDir)..\llvm\Config\config.h"
+						CommandLine="copy $(InputPath)+$(SolutionDir)config.h  $(ProjectDir)..\llvm\Config\config.h"
+						AdditionalDependencies="$(SolutionDir)config.h"
 						Outputs="$(ProjectDir)..\llvm\Config\config.h"/>
 				</FileConfiguration>
 			</File>
@@ -102,7 +86,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\Support\DataTypes.h"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\Support\DataTypes.h"
+						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\Support\DataTypes.h
+"
 						Outputs="$(ProjectDir)..\llvm\Support\DataTypes.h"/>
 				</FileConfiguration>
 			</File>
@@ -113,7 +98,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\ADT\hash_map"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_map"
+						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_map
+"
 						Outputs="$(ProjectDir)..\llvm\ADT\hash_map"/>
 				</FileConfiguration>
 			</File>
@@ -124,7 +110,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\ADT\hash_set"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_set"
+						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_set
+"
 						Outputs="$(ProjectDir)..\llvm\ADT\hash_set"/>
 				</FileConfiguration>
 			</File>
@@ -135,7 +122,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\ADT\iterator"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\iterator"
+						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\iterator
+"
 						Outputs="$(ProjectDir)..\llvm\ADT\iterator"/>
 				</FileConfiguration>
 			</File>