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).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25477 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 0364b1b2ea7ffe77aea3f5c6b403ff8e0f891ed8..c53e7f71c144ab85dc67405d2a0bf02199e1a83b 100644 (file)
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -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 &quot;LLVM (win32 vc7.1)&quot; &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define PACKAGE_VERSION 1.4 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_WINDOWS_H 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_LIMITS_H 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_SYS_STAT_H 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_STDLIB_H 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_STDIO_H 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_STRING_H 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define SHLIBEXT &quot;.lib&quot; &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define error_t int &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define HAVE_ERRNO_H 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_DLOPEN_DEPLIBS 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_OBJDIR &quot;_libs&quot; &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_SHLIBPATH_VAR &quot;PATH&quot; &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_SHLIB_EXT &quot;.dll&quot; &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define LTDL_SYSSEARCHPATH &quot;&quot; &gt;&gt;$(ProjectDir)..\llvm\Config\config.h
-echo #define LLVM_ON_WIN32 1 &gt;&gt;$(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 @@ echo #define LLVM_ON_WIN32 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h"
                                        <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 @@ echo #define LLVM_ON_WIN32 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h"
                                        <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 @@ echo #define LLVM_ON_WIN32 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h"
                                        <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 @@ echo #define LLVM_ON_WIN32 1 &gt;&gt;$(ProjectDir)..\llvm\Config\config.h"
                                        <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>

diff --git a/win32/config.h b/win32/config.h
new file mode 100644 (file)
index 0000000..be3f3fc
--- /dev/null
+++ b/win32/config.h
@@ -0,0 +1,24 @@
+/* This file is appended to config.h.in to form the Windows version of
+ * config.h */
+
+#define PACKAGE_NAME "LLVM (win32 vc7.1)" 
+#define PACKAGE_VERSION 1.4 
+#define HAVE_WINDOWS_H 1 
+#define HAVE_LIMITS_H 1 
+#define HAVE_SYS_STAT_H 1 
+#define HAVE_STDLIB_H 1 
+#define HAVE_STDIO_H 1 
+#define HAVE_STRING_H 1 
+#define SHLIBEXT ".lib" 
+#define error_t int 
+#define HAVE_ERRNO_H 1 
+#define LTDL_DLOPEN_DEPLIBS 1 
+#define HAVE_CEIL 1 
+#define HAVE_CEILF 1 
+#define HAVE_FLOOR 1 
+#define HAVE_FLOORF 1 
+#define LTDL_OBJDIR "_libs" 
+#define LTDL_SHLIBPATH_VAR "PATH" 
+#define LTDL_SHLIB_EXT ".dll" 
+#define LTDL_SYSSEARCHPATH "" 
+#define LLVM_ON_WIN32 1