]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - win/configure.cpp
Run configure -update on all svn/git changes
[user/henk/code/inspircd.git] / win / configure.cpp
index 1b097da065bdce4990b8a44c152b7a39d1720e60..b6f009fda386a895e6c9917fd2e02f2e9145f4e6 100644 (file)
@@ -2,8 +2,8 @@
  *        | Inspire Internet Relay Chat Daemon |
  *        +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *                     the file COPYING for details.
@@ -13,6 +13,7 @@
 
 #define _CRT_SECURE_NO_DEPRECATE
 
+#define CONFIGURE_BUILD
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdio.h>
@@ -27,6 +28,7 @@ void Banner();
 void WriteCompileModules();
 void WriteCompileCommands();
 void Rebase();
+void CopyExtras();
 
 /* detects if we are running windows xp or higher (5.1) */
 bool iswinxp()
@@ -146,13 +148,7 @@ int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPS
 {
        if (!strcmp(lpCmdLine, "/rebase"))
        {
-               AllocConsole();
-               // pipe standard handles to this console
-               freopen("CONIN$", "r", stdin);
-               freopen("CONOUT$", "w", stdout);
-               freopen("CONOUT$", "w", stderr);
                Rebase();
-               FreeConsole();
                return 0;
        }
        FILE * j = fopen("inspircd_config.h", "r");
@@ -194,7 +190,6 @@ void Banner()
 void Run()
 {
        bool use_iocp = false;
-       bool support_ip6links = true;
        bool use_openssl = false;
        bool ipv6 = true;
        char mod_path[MAX_PATH];
@@ -205,16 +200,6 @@ void Run()
        char revision_text[MAX_PATH];
        char openssl_inc_path[MAX_PATH];
        char openssl_lib_path[MAX_PATH];
-
-       int nicklen = 31;
-       int chanlen = 64;
-       int modechanges = 20;
-       int identlen = 12;
-       int quitlen = 255;
-       int topiclen = 500;
-       int kicklen = 255;
-       int rllen = 128;
-       int awaylen = 200;
        int revision = get_svn_revision(revision_text, MAX_PATH);
        char version[514];
 
@@ -256,11 +241,6 @@ void Run()
 
        ipv6 = get_bool_option("Do you want to enable IPv6?", false);
 
-       if (!ipv6)
-               support_ip6links = get_bool_option("\nYou have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled InspIRCd servers?\nIf you are using a recent operating system and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)", true);
-       else
-               support_ip6links = true;
-       
        printf_c("\033[1mAll paths are relative to the binary directory.\033[0m\n");
        get_string_option("In what directory do you wish to install the InspIRCd base?", "..", base_path);
        get_string_option("In what directory are the configuration files?", "../conf", config_file);
@@ -268,24 +248,6 @@ void Run()
        get_string_option("In what directory is the IRCd binary to be placed?", ".", bin_dir);
        get_string_option("In what directory are the IRCd libraries to be placed?", "../lib", library_dir);
 
-       printf_c("The following questions will ask you for various figures relating\n"
-               "To your IRCd install. Please note that these should usually be left\n"
-               "as defaults unless you have a real reason to change them. If they\n"
-               "changed, then the values must be identical on all servers on your\n"
-               "network, or malfunctions and/or crashes may occur, with the exception\n"
-               "of the 'maximum number of clients' setting which may be different on\n"
-               "different servers on the network.\n\n");
-
-       nicklen = get_int_option("Please enter the maximum length of nicknames?", 31);
-       chanlen = get_int_option("Please enter the maximum length of channel names?", 64);
-       modechanges = get_int_option("Please enter the maximum number of mode changes in one line?", 20);
-       identlen = get_int_option("Please enter the maximum length of an ident (username)?", 12);
-       quitlen = get_int_option("Please enter the maximum length of a quit message?", 255);
-       topiclen = get_int_option("Please enter the maximum length of a channel topic?", 307);
-       kicklen = get_int_option("Please enter the maximum length of a kick message?", 255);
-       rllen = get_int_option("Please enter the maximum length of a GECOS (real name)?", 128);
-       awaylen = get_int_option("Please enter the maximum length of an away message?", 200);
-
        // NOTE: this may seem hackish (generating a batch build script), but it assures the user knows
        // what they're doing, and we don't have to mess with copying files and changing around modules.mak
        // for the extra libraries. --fez
@@ -316,7 +278,7 @@ void Run()
                fprintf(fp, "echo NOTE: this batch file should be invoked from the Visual Studio Command Prompt (vsvars32.bat)\n");
                fprintf(fp, "set OPENSSL_INC_PATH=\"%s\"\n", openssl_inc_path);
                fprintf(fp, "set OPENSSL_LIB_PATH=\"%s\"\n", openssl_lib_path);
-               fprintf(fp, "set COMPILE=cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP /I %%OPENSSL_INC_PATH%% m_ssl_openssl.cpp ..\\..\\win\\inspircd_memory_functions.cpp %%OPENSSL_INC_PATH%%\\openssl\\applink.c /link /LIBPATH:%%OPENSSL_LIB_PATH%% ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\m_ssl_openssl.so\" /PDB:\"..\\..\\bin\\release\\modules\\m_ssl_openssl.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\m_ssl_openssl.lib\"\n");
+               fprintf(fp, "set COMPILE=cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP /I %%OPENSSL_INC_PATH%% m_ssl_openssl.cpp ..\\..\\win\\inspircd_memory_functions.cpp %%OPENSSL_INC_PATH%%\\openssl\\applink.c /link /LIBPATH:%%OPENSSL_LIB_PATH%% ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\m_ssl_openssl.so\" /PDB:\"..\\..\\bin\\release\\modules\\m_ssl_openssl.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\m_ssl_openssl.lib\"\n");
                fprintf(fp, "cd ..\\src\\modules\n");
                fprintf(fp, "copy extra\\m_ssl_openssl.cpp .\n");
                fprintf(fp, "echo \t%%COMPILE%%\n");
@@ -333,21 +295,15 @@ void Run()
 
        printf_c("\n\033[1;32mPre-build configuration is complete!\n\n");       sc(TNORMAL);
 
+       CopyExtras();
+
        // dump all the options back out
        printf_c("\033[0mBase install path:\033[1;32m        %s\n", base_path);
        printf_c("\033[0mConfig path:\033[1;32m              %s\n", config_file);
        printf_c("\033[0mModule path:\033[1;32m              %s\n", mod_path);
        printf_c("\033[0mLibrary path:\033[1;32m             %s\n", library_dir);
        printf_c("\033[0mSocket Engine:\033[1;32m            %s\n", use_iocp ? "iocp" : "select");
-       printf_c("\033[0mMax nickname length:\033[1;32m      %u\n", nicklen);
-       printf_c("\033[0mMax channel length:\033[1;32m       %u\n", chanlen);
-       printf_c("\033[0mMax mode length:\033[1;32m          %u\n", modechanges);
-       printf_c("\033[0mMax ident length:\033[1;32m         %u\n", identlen);
-       printf_c("\033[0mMax quit length:\033[1;32m          %u\n", quitlen);
-       printf_c("\033[0mMax topic length:\033[1;32m         %u\n", topiclen);
-       printf_c("\033[0mMax kick length:\033[1;32m          %u\n", kicklen);
-       printf_c("\033[0mMax name length:\033[1;32m          %u\n", rllen);
-       printf_c("\033[0mMax away length:\033[1;32m          %u\n", awaylen);
+
        printf("\n"); sc(TNORMAL);
        if(get_bool_option("Are these settings correct?", true) == false)
        {
@@ -374,20 +330,9 @@ void Run()
        fprintf(f, "#define CONFIG_FILE \"%s/inspircd.conf\"\n", config_file);
        fprintf(f, "#define MOD_PATH \"%s\"\n", mod_path);
        fprintf(f, "#define SOMAXCONN_S \"128\"\n");
-       fprintf(f, "#define NICKMAX %u\n", nicklen+1);
-       fprintf(f, "#define CHANMAX %u\n", chanlen+1);
-       fprintf(f, "#define MAXMODES %u\n", modechanges);
-       fprintf(f, "#define IDENTMAX %u\n", identlen);
-       fprintf(f, "#define MAXQUIT %u\n", quitlen);
-       fprintf(f, "#define MAXTOPIC %u\n", topiclen);
-       fprintf(f, "#define MAXKICK %u\n", kicklen);
-       fprintf(f, "#define MAXGECOS %u\n", rllen);
-       fprintf(f, "#define MAXAWAY %u\n", awaylen);
        fprintf(f, "#define LIBRARYDIR \"%s\"\n", library_dir);
        fprintf(f, "#define VERSION \"%s\"\n", version);
        fprintf(f, "#define REVISION \"%s\"\n", revision_text);
-       if(support_ip6links)
-               fprintf(f, "#define SUPPORT_IP6LINKS 1\n");
 
        OSVERSIONINFO vi;
        vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@@ -399,8 +344,9 @@ void Run()
 #endif
        fprintf(f, "#define MAXBUF 514\n");
 
-       fprintf(f, "\n#include \"inspircd_win32wrapper.h\"\n\n");
-       fprintf(f, "#include \"threadengines/threadengine_win32.h\"\n\n");
+       fprintf(f, "\n#include \"inspircd_win32wrapper.h\"");
+       fprintf(f, "\n#include \"inspircd_namedpipe.h\"");
+       fprintf(f, "\n#include \"threadengines/threadengine_win32.h\"\n\n");
        fprintf(f, "#endif\n\n");
        fclose(f);
 
@@ -424,6 +370,43 @@ void Run()
        printf("\nconfigure is done.. exiting!\n");
 }
 
+/* Keeps files from modules/extra up to date if theyre copied into modules/ */
+void CopyExtras()
+{
+       char dest[65535];
+       char src[65535];
+
+       printf("\nUpdating extra modules in src/modules...\n");
+
+       WIN32_FIND_DATA fd;
+       HANDLE fh = FindFirstFile("..\\src\\modules\\extra\\*.*", &fd);
+
+       if(fh == INVALID_HANDLE_VALUE)
+               return;
+
+       do
+       {
+               strcpy(dest, "..\\src\\modules\\");
+               strcat(dest, fd.cFileName);
+               strcpy(src, "..\\src\\modules\\extra\\");
+               strcat(src, fd.cFileName);
+               FILE* x = fopen(dest, "r");
+               if (x)
+               {
+                       fclose(x);
+                       CopyFile(src, dest, false);
+                       sc(TGREEN); printf("    %s", fd.cFileName); sc(TNORMAL);
+                       printf("...\n");
+               }
+       }
+       while (FindNextFile(fh, &fd));
+
+       FindClose(fh);
+
+       printf("\n\n");
+}
+
+
 void Rebase()
 {
        char dest[65535];
@@ -432,13 +415,21 @@ void Rebase()
        *dest = 0;
 
        WIN32_FIND_DATA fd;
+#ifdef _DEBUG
+       HANDLE fh = FindFirstFile("..\\bin\\debug\\lib\\*.so", &fd);
+#else
        HANDLE fh = FindFirstFile("..\\bin\\release\\lib\\*.so", &fd);
+#endif
        if(fh == INVALID_HANDLE_VALUE)
                return;
 
        do
        {
+#ifdef _DEBUG
+               strcat(dest, " ..\\bin\\debug\\lib\\");
+#else
                strcat(dest, " ..\\bin\\release\\lib\\");
+#endif
                strcat(dest, fd.cFileName);
        }
        while (FindNextFile(fh, &fd));
@@ -449,7 +440,11 @@ void Rebase()
        printf("%s\n", command);
        system(command);
 
+#ifdef _DEBUG
+       fh = FindFirstFile("..\\bin\\debug\\modules\\*.so", &fd);
+#else
        fh = FindFirstFile("..\\bin\\release\\modules\\*.so", &fd);
+#endif
        if(fh == INVALID_HANDLE_VALUE)
                return;
 
@@ -457,12 +452,16 @@ void Rebase()
 
        do
        {
+#ifdef _DEBUG
+               strcat(dest, " ..\\bin\\debug\\modules\\");
+#else
                strcat(dest, " ..\\bin\\release\\modules\\");
+#endif
                strcat(dest, fd.cFileName);
        }
        while (FindNextFile(fh, &fd));
 
-       sprintf(command, "rebase.exe -v -b 10000000 -c baseaddr_modules.txt %s", dest);
+       sprintf(command, "rebase.exe -v -b 11000000 -c baseaddr_modules.txt %s", dest);
        printf("%s\n", command);
        system(command);
 
@@ -508,13 +507,13 @@ void WriteCompileCommands()
 #ifdef WIN64
        // /MACHINE:X64
        #ifdef _DEBUG
-               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 /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\lib\\$*.lib\"\n\n");
+               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 /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\lib\\$*.lib\"\n\n");
                CreateDirectory("..\\src\\debug", NULL);
                CreateDirectory("..\\bin\\debug\\bin", NULL);
                CreateDirectory("..\\bin\\debug\\lib", NULL);
                CreateDirectory("..\\bin\\debug\\modules", NULL);
        #else
-               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 /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\lib\\$*.lib\"\n\n");
+               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 /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\lib\\$*.lib\"\n\n");
                CreateDirectory("..\\src\\release", NULL);
                CreateDirectory("..\\bin\\release\\bin", NULL);
                CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -522,13 +521,13 @@ void WriteCompileCommands()
        #endif
 #else
        #ifdef _DEBUG
-               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 /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /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");
+               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 /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /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");
                CreateDirectory("..\\src\\debug", NULL);
                CreateDirectory("..\\bin\\debug\\bin", NULL);
                CreateDirectory("..\\bin\\debug\\lib", NULL);
                CreateDirectory("..\\bin\\debug\\modules", NULL);
        #else
-               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 /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /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");
+               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 /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /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");
                CreateDirectory("..\\src\\release", NULL);
                CreateDirectory("..\\bin\\release\\bin", NULL);
                CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -536,7 +535,11 @@ void WriteCompileCommands()
        #endif
 #endif
 
-       fprintf(f, "makedir:\n  if not exist debug mkdir debug\n  if not exist release mkdir release\n\n");
+#ifdef _DEBUG
+       fprintf(f, "makedir:\n  if not exist debug mkdir debug\n  if not exist ..\\..\\bin\\debug\\lib mkdir ..\\..\\bin\\debug\\lib\n\n");
+#else
+       fprintf(f, "makedir:\n  if not exist release mkdir release\n  if not exist ..\\..\\bin\\release\\lib mkdir ..\\..\\bin\\release\\lib\n\n");
+#endif
        
        // dump modules.. again the second and last time :)
        for(int i = 0; i < command_count; ++i)
@@ -585,21 +588,21 @@ void WriteCompileModules()
 #ifdef WIN64
        // /MACHINE:X64
        #ifdef _DEBUG
-               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 /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");
+               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 /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");
                CreateDirectory("..\\src\\modules\\debug_x64", NULL);
        #else
-               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 /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");
+               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 /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");
                CreateDirectory("..\\src\\modules\\release_x64", NULL);
        #endif
 #else
        #ifdef _DEBUG
-               fprintf(f, "  cl /nologo -Dssize_t=long /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 /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /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");
+               fprintf(f, "  cl /nologo -Dssize_t=long /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 /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /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");
                CreateDirectory("..\\src\\modules\\debug", NULL);
                CreateDirectory("..\\src\\modules\\debug\\lib", NULL);
                CreateDirectory("..\\src\\modules\\debug\\modules", NULL);
                CreateDirectory("..\\src\\modules\\debug\\bin", NULL);
        #else
-               fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /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");
+               fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /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");
                CreateDirectory("..\\src\\modules\\release", NULL);
                CreateDirectory("..\\src\\modules\\release\\lib", NULL);
                CreateDirectory("..\\src\\modules\\release\\modules", NULL);
@@ -607,7 +610,11 @@ void WriteCompileModules()
        #endif
 #endif
        
-       fprintf(f, "makedir:\n  if not exist debug mkdir debug\n  if not exist release mkdir release\n\n");
+#ifdef _DEBUG
+       fprintf(f, "makedir:\n  if not exist debug mkdir debug\n  if not exist ..\\..\\bin\\debug\\modules mkdir ..\\..\\bin\\debug\\modules\n\n");
+#else
+       fprintf(f, "makedir:\n  if not exist release mkdir release\n  if not exist ..\\..\\bin\\release\\modules mkdir ..\\..\\bin\\release\\modules\n\n");
+#endif
 
        // dump modules.. again the second and last time :)
        for(int i = 0; i < module_count; ++i)