Update from burlex, thanks

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7057 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/win/configure.cpp b/win/configure.cpp
index 91ffe76f276905ea178c1a18e3727289fe44f730..890872fddc88c3f69ea1a28049ac06693a51789e 100644 (file)
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -3,6 +3,7 @@
 #include <windows.h>\r
 #include <stdio.h>\r
 #include <string>\r
+#include <time.h>\r
 #include "colours.h"\r
 \r
 using namespace std;\r
@@ -17,10 +18,7 @@ bool iswinxp()
        OSVERSIONINFO vi;\r
        vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);\r
        GetVersionEx(&vi);\r
-       if(vi.dwMajorVersion > 5)\r
-               return true;\r
-\r
-       if(vi.dwMajorVersion >= 5 && vi.dwMinorVersion >= 1)\r
+       if(vi.dwMajorVersion >= 5)\r
                return true;\r
        \r
        return false;\r
@@ -218,7 +216,7 @@ void Run()
        // detect windows\r
        if(iswinxp())\r
        {\r
-               printf_c("You are running Windows XP or above, and IOCP support is most likely available.\n"\r
+               printf_c("You are running Windows 2000 or above, and IOCP support is most likely available.\n"\r
                             "This removes the socket number limitation of select and is much more efficent.\n"\r
                                 "If you are unsure, answer yes.\n\n");\r
 \r
@@ -376,9 +374,9 @@ void WriteCompileCommands()
        FILE * f = fopen("..\\src\\commands-release.mak", "w");\r
 #endif\r
 \r
-       fprintf(f, "# Generated at SOMETIME\n");\r
-       fprintf(f, "!include <win32.mak>\n\n");\r
-       fprintf(f, "all: ");\r
+       time_t t = time(NULL);\r
+       fprintf(f, "# Generated at %s\n", ctime(&t));\r
+       fprintf(f, "all: makedir ");\r
 \r
        // dump modules.. first time :)\r
        for(int i = 0; i < command_count; ++i)\r
@@ -386,11 +384,12 @@ void WriteCompileCommands()
 \r
        fprintf(f, "\n.cpp.obj:\n");\r
 #ifdef _DEBUG\r
-       fprintf(f, "  $(cc) /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GS /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\debug\\bin\\inspircd.lib /OUT:\"$*.so\"\n\n");\r
+       fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GS /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\debug\\bin\\inspircd.lib /OUT:\"..\\bin\\debug\\lib\\$*.so\" /PDB:\"..\\bin\\debug\\lib\\$*.pdb\" /IMPLIB:\"..\\bin\\debug\\lib\\$*.lib\"\n\n");\r
 #else\r
-       fprintf(f, "  $(cc) /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /GS /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\release\\bin\\inspircd.lib /OUT:\"$*.so\"\n\n");\r
+       fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /GS /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\release\\bin\\inspircd.lib /OUT:\"..\\bin\\release\\lib\\$*.so\" /PDB:\"..\\bin\\release\\lib\\$*.pdb\" /IMPLIB:\"..\\bin\\release\\lib\\$*.lib\"\n\n");\r
 #endif\r
 \r
+       fprintf(f, "makedir:\n  if not exist debug mkdir debug\n\n");\r
        \r
        // dump modules.. again the second and last time :)\r
        for(int i = 0; i < command_count; ++i)\r
@@ -431,9 +430,9 @@ void WriteCompileModules()
        FILE * f = fopen("..\\src\\modules\\modules-release.mak", "w");\r
 #endif\r
 \r
-       fprintf(f, "# Generated at SOMETIME\n");\r
-       fprintf(f, "!include <win32.mak>\n\n");\r
-       fprintf(f, "all: ");\r
+       time_t t = time(NULL);\r
+       fprintf(f, "# Generated at %s\n", ctime(&t));\r
+       fprintf(f, "all: makedir ");\r
 \r
        // dump modules.. first time :)\r
        for(int i = 0; i < module_count; ++i)\r
@@ -441,11 +440,12 @@ void WriteCompileModules()
 \r
        fprintf(f, "\n.cpp.obj:\n");\r
 #ifdef _DEBUG\r
-       fprintf(f, "  $(cc) /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GS /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"$*.so\"\n\n");\r
+       fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GS /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");\r
 #else\r
-       fprintf(f, "  $(cc) /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /GS /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"$*.so\"\n\n");\r
+       fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /GS /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");\r
 #endif\r
-\r
+       \r
+       fprintf(f, "makedir:\n  if not exist debug mkdir debug\n\n");\r
 \r
        // dump modules.. again the second and last time :)\r
        for(int i = 0; i < module_count; ++i)\r