]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - win/configure.cpp
Merge pull request #274 from ChrisTX/insp20+gnutlsdeprecation
[user/henk/code/inspircd.git] / win / configure.cpp
index 290b8e7a1b4beeb2ec74f383a5d22524b3feaf40..6f821894b53103c445648e4ff74181e533cb4535 100644 (file)
@@ -1,54 +1,78 @@
-/*        +------------------------------------+
- *        | Inspire Internet Relay Chat Daemon |
- *        +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2011 Adam <Adam@anope.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Eric Dietz <root@wrongway.org>
+ *   Copyright (C) 2007 Burlex <???@???>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *                     the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #define _CRT_SECURE_NO_DEPRECATE
 
+#define CONFIGURE_BUILD
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdio.h>
+#include <process.h>
+#include "../include/consolecolors.h"
+
+WORD g_wOriginalColors;
+WORD g_wBackgroundColor;
+HANDLE g_hStdout;
+
+#include <iostream>
 #include <string>
+#include <vector>
 #include <time.h>
 #include "inspircd_win32wrapper.h"
-#include "colours.h"
 
 using namespace std;
 void Run();
 void Banner();
-void WriteCompileModules();
+void WriteCompileModules(const vector<string> &, const vector<string> &);
 void WriteCompileCommands();
+void CopyExtras();
 
-/* detects if we are running windows xp or higher (5.1) */
-bool iswinxp()
-{
-       OSVERSIONINFO vi;
-       vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-       GetVersionEx(&vi);
-       if(vi.dwMajorVersion >= 5)
-               return true;
-       
-       return false;
-}
+#ifdef _WIN64
+       // /MACHINE:X64
+       #ifdef _DEBUG
+               #define OUTFOLDER "debug_x64"   
+       #else
+               #define OUTFOLDER "release_x64" 
+       #endif
+#else
+       #ifdef _DEBUG
+               #define OUTFOLDER "debug"       
+       #else
+               #define OUTFOLDER "release"     
+       #endif
+#endif
 
 int get_int_option(const char * text, int def)
 {
        static char buffer[500];
        int ret;
-       printf_c("%s\n[\033[1;32m%u\033[0m] -> ", text, def);
-       fgets(buffer, 500, stdin);
+       std::cout << text << std::endl << " [" << con_green << def << con_reset << "] -> ";
+       fgets(buffer, sizeof(buffer), stdin);
        if(sscanf(buffer, "%u", &ret) != 1)
                ret = def;
 
-       printf("\n");
+       std::cout << std::endl;
        return ret;
 }
 
@@ -56,109 +80,150 @@ bool get_bool_option(const char * text, bool def)
 {
        static char buffer[500];
        char ret[100];
-       printf_c("%s [\033[1;32m%c\033[0m] -> ", text, def ? 'y' : 'n');
-       fgets(buffer, 500, stdin);
+       std::cout << text << " [" << con_green << (def ? 'y' : 'n') << con_reset << "] -> ";
+       fgets(buffer, sizeof(buffer), stdin);
        if(sscanf(buffer, "%s", ret) != 1)
                strcpy(ret, def ? "y" : "n");
 
-       printf("\n");
-       return !strncmp(ret, "y", 1);
+       std::cout << std::endl;
+       return !strnicmp(ret, "y", 1);
 }
 
-void get_string_option(const char * text, char * def, char * buf)
+string get_string_option(const char * text, char * def)
 {
-       static char buffer[500];
-       if (*def)
-               printf_c("%s\n[\033[1;32m%s\033[0m] -> ", text, def);
+       if (def && *def)
+               std::cout << text << std::endl << "[" << con_green << def << con_reset << "] -> ";
        else
-               printf_c("%s\n[] -> ", text);
-       fgets(buffer, 500, stdin);
-       if(sscanf(buffer, "%s", buf) != 1)
+               std::cout << text << std::endl << "[] -> ";
+       
+       char buffer[1000], buf[1000];
+       fgets(buffer, sizeof(buffer), stdin);
+       if (sscanf(buffer, "%s", buf) != 1)
                strcpy(buf, def);
-
-       printf("\n");
+       
+       std::cout << std::endl;
+       return buf;
 }
 
 // escapes a string for use in a c++ file
-bool escape_string(char * str, size_t size)
+void escape_string(string &str)
 {
-       size_t len = strlen(str);
-       char * d_str = (char*)malloc(len * 2);
+       string copy = str;
+       str.clear();
        
-       size_t i = 0;
-       size_t j = 0;
+       for (unsigned i = 0; i < copy.size(); ++i)
+       {
+               str += copy[i];
+               if (copy[i] == '\\')
+                       str += '\\';
+       }
+}
 
-       for(; i < len; ++i)
+string get_git_commit()
+{
+       char buf[128];
+       char *ref = NULL, *commit = NULL;
+       FILE *f = fopen("../.git/HEAD", "r");
+       if (f)
        {
-               if(str[i] == '\\')
+               if (fgets(buf, sizeof(buf), f))
                {
-                       d_str[j++] = '\\';
-                       d_str[j++] = '\\';
+                       while (isspace(buf[strlen(buf) - 1]))
+                               buf[strlen(buf) - 1] = 0;
+                       char *p = strchr(buf, ' ');
+                       if (p)
+                               ref = ++p;
                }
-               else
+               fclose(f);
+       }
+       if (ref == NULL)
+               return "";
+       string ref_file = string("../.git/") + string(ref);
+       f = fopen(ref_file.c_str(), "r");
+       if (f)
+       {
+               if (fgets(buf, sizeof(buf), f))
                {
-                       d_str[j++] = str[i];
+                       while (isspace(buf[strlen(buf) - 1]))
+                               buf[strlen(buf) - 1] = 0;
+                       commit = buf;
                }
+               fclose(f);
        }
 
-       d_str[j++] = 0;
+       return commit != NULL ? commit : "0";
+}
+
+void get_machine_info(char * buffer, size_t len)
+{
+       char buf[500];
+       char buf2[500];
+
+       DWORD dwSize = sizeof(buf);
+       if (!GetComputerNameExA((COMPUTER_NAME_FORMAT)ComputerNameDnsFullyQualified, buf, &dwSize))
+               sprintf(buf, "%s", "unknown");
 
-       if(j > size)
+       FILE * f = fopen("ver.txt.tmp", "r");
+       if (f)
        {
-               free(d_str);
-               return false;
+               while (fgets(buf2, sizeof(buf2), f)) { }
+               fclose(f);
+               _unlink("ver.txt.tmp");
        }
+       else
+               sprintf(buf2, "%s", "unknown");
 
-       strcpy(str, d_str);
-       free(d_str);
-       return true;
+       sprintf(buffer, "%s ", buf);
+       //strip newlines
+       char* b = buffer + strlen(buf)+1;
+       char *b2 = buf2;
+       while (*b2)
+       {
+               if (*b2 != 10 && *b2 != 13)
+               {
+                       *b = *b2;
+                       b++;
+               }
+               *b2++;
+       }
+       *b = 0;
 }
 
-/* gets the svn revision */
-int get_svn_revision(char * buffer, size_t len)
+vector<string> get_dir_list(const string &path_list)
 {
-       /* again.. I am lazy :p cbf to pipe output of svn info to us, so i'll just read the file */
-       /*
-       8
-
-       dir
-       7033
-       */
-       char buf[1000];
-       int rev = 0;
-       
-       FILE * f = fopen("..\\.svn\\entries", "r");
-       if (f)
+       char *paths = _strdup(path_list.c_str());
+       char *paths_save = paths;
+       char *p = paths;
+       vector<string> paths_return;
+
+       while ((p = strchr(paths, ';')))
        {
-               fgets(buf, 1000, f);
-               fgets(buf, 1000, f);
-               fgets(buf, 1000, f);
-               fgets(buf, 1000, f);
-               rev = atoi(buf);
-               sprintf(buffer, "%u", rev);
-               fclose(f);
+               *p++ = 0;
+               paths_return.push_back(paths);
+               paths = p;
        }
+       if (paths != NULL)
+               paths_return.push_back(paths);
+       free(paths_save);
        
-       return rev;
-       
-bad_rev:
-       strcpy(buffer, "non-svn");
-       if(f) fclose(f);
-       return 0;
+       return paths_return;
 }
 
 int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPSTR lpCmdLine, IN int nShowCmd )
 {
-       FILE * j = fopen("inspircd_config.h", "r");
+       FILE * j = fopen("..\\include\\inspircd_config.h", "r");
        if (j)
        {
-               if (MessageBox(0, "inspircd_config.h already exists. Remove it and build from clean?", "Configure program", MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2) != IDYES)
+               if (MessageBoxA(0, "inspircd_config.h already exists. Remove it and build from clean?", "Configure program", MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2) != IDYES)
                {
                        fclose(j);
                        exit(0);
                }
        }
 
+       // call before we hook console handles
+       system("ver > ver.txt.tmp");
+
        AllocConsole();
 
        // pipe standard handles to this console
@@ -166,6 +231,20 @@ int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPS
        freopen("CONOUT$", "w", stdout);
        freopen("CONOUT$", "w", stderr);
 
+       // Initialize the console values
+       g_hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
+       CONSOLE_SCREEN_BUFFER_INFO bufinf;
+       if(GetConsoleScreenBufferInfo(g_hStdout, &bufinf))
+       {
+               g_wOriginalColors = bufinf.wAttributes & 0x00FF;
+               g_wBackgroundColor = bufinf.wAttributes & 0x00F0;
+       }
+       else
+       {
+               g_wOriginalColors = FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN;
+               g_wBackgroundColor = 0;
+       }
+
        Banner();
        Run();
        FreeConsole();
@@ -174,50 +253,31 @@ int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPS
 
 void Banner()
 {
-       printf_c("\nWelcome to the \033[1mInspIRCd\033[0m Configuration program! (\033[1minteractive mode\033[0m)\n"
-                        "\033[1mPackage maintainers: Type ./configure --help for non-interactive help\033[0m\n\n");
-       printf_c("*** If you are unsure of any of these values, leave it blank for      ***\n"
-                        "*** standard settings that will work, and your server will run          ***\n"
-                        "*** using them. Please consult your IRC network admin if in doubt.  ***\n\n"
-                        "Press \033[1m<RETURN>\033[0m to accept the default for any option, or enter\n"
-                        "a new value. Please note: You will \033[1mHAVE\033[0m to read the docs\n"
-                        "dir, otherwise you won't have a config file!\n\n");
+       std::cout << std::endl << "Welcome to the " << con_white_bright << "InspIRCd" << con_reset << " Configuration program! (" << con_white_bright << "interactive mode" << con_reset << ")" << std::endl
+                        << con_white_bright << "Package maintainers: Type ./configure --help for non-interactive help" << con_reset << std::endl << std::endl
+                    << "*** If you are unsure of any of these values, leave it blank for       ***" << std::endl
+                        << "*** standard settings that will work, and your server will run       ***" << std::endl
+                        << "*** using them. Please consult your IRC network admin if in doubt.  ***" << std::endl << std::endl
+                        << "Press " << con_white_bright << "<RETURN>" << con_reset << " to accept the default for any option, or enter" << std::endl
+                        << "a new value. Please note: You will " << con_white_bright << "HAVE" << con_reset << " to read the docs" << std::endl
+                        << "dir, otherwise you won't have a config file!" << std::endl << std::endl;
 
 }
 
 void Run()
 {
-       bool use_iocp = false;
-       bool support_ip6links = true;
-       bool use_openssl = false;
-       bool ipv6 = true;
-       char mod_path[MAX_PATH];
-       char config_file[MAX_PATH];
-       char library_dir[MAX_PATH];
-       char base_path[MAX_PATH];
-       char bin_dir[MAX_PATH];
-       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);
+       vector<string> extra_include_paths, extra_lib_paths;
+       string revision = get_git_commit();
        char version[514];
+       char machine_text[MAX_PATH];
+       get_machine_info(machine_text, MAX_PATH);
 
        // grab version
        FILE * fI = fopen("..\\src\\version.sh", "r");
        if(fI)
        {
-               fgets(version, 514, fI);
-               fgets(version, 514, fI);
+               fgets(version, sizeof(version), fI);
+               fgets(version, sizeof(version), fI);
                char * p2 = version;
                while(*p2 != '\"')
                        ++p2;
@@ -230,214 +290,152 @@ void Run()
                fclose(fI);
        }
        else
-               strcpy(version, "InspIRCD-Unknown");
-#ifdef WIN64
-       printf_c("Your operating system is: \033[1;32mwindows_x64 \033[0m\n");
+               strcpy(version, "InspIRCd-0.0.0");
+       
+       string branch(version);
+       branch.erase(branch.find_last_of('.'));
+       
+       std::cout << "Your operating system is: " << con_green << "Windows " <<
+#ifdef _WIN64
+       "x64 (64-bit)"
 #else
-       printf_c("Your operating system is: \033[1;32mwindows_x32 \033[0m\n");
+       "x86 (32-bit)"
 #endif
-       printf_c("InspIRCd revision ID: \033[1;32m%s \033[0m\n\n", revision ? revision_text : "(Non-SVN build)");
-
-       // detect windows
-       if(iswinxp())
+       << con_reset << std::endl << "InspIRCd revision ID: " << con_green << ( (!revision.empty() && revision != "0") ? revision : "(Non-GIT build)" ) << con_reset << std::endl << std::endl
+       << con_white_bright << "Extra modules." << con_reset << std::endl;
+       if (get_bool_option("Do you want to compile any extra non-core modules?", false))
        {
-               printf_c("You are running Windows 2000 or above, and IOCP support is most likely available.\n"
-                                "Thisis much more efficent but is currently EXPERIMENTAL and UNSUPPORTED.\n"
-                                "If you are unsure, answer no.\n\n");
-
-               use_iocp = get_bool_option("Do you want to use the IOCP implementation?", false);
+               string extra_i_path = get_string_option("Extra include search paths separate by \";\"", ".");
+               string extra_l_path = get_string_option("Extra library search paths, separate by \";\"", ".");
+               
+               extra_include_paths = get_dir_list(extra_i_path);
+               extra_lib_paths = get_dir_list(extra_l_path);
        }
 
-       ipv6 = get_bool_option("Do you want to enable IPv6?", false);
+       std::cout << con_white_bright << "All paths are relative to the binary directory." << con_reset << std::endl;
+       string base_path = get_string_option("In what directory do you wish to install the InspIRCd base?", "..");
+       string config_path = get_string_option("In what directory are the configuration files?", "conf");
+       string mod_path = get_string_option("In what directory are the modules to be compiled to?", "modules");
+       string data_path = get_string_option("In what directory is the variable data to be placed in?", "data");
+       string log_path = get_string_option("In what directory is the logs to be placed in?", "logs");
+       string bin_dir = get_string_option("In what directory is the IRCd binary to be placed?", ".");
 
-       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);
-       get_string_option("In what directory are the modules to be compiled to?", "../modules", mod_path);
-       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
-       // in case it exists, remove old m_ssl_openssl.cpp
-       remove("..\\src\\modules\\m_ssl_openssl.cpp");
-       printf_c("You can compile InspIRCd modules that add OpenSSL or GnuTLS support for SSL functionality.\n"
-               "To do so you will need the appropriate link libraries and header files on your system.\n");
-       use_openssl = get_bool_option("Would you like to compile the IRCd with OpenSSL support?", false);
-       if (use_openssl)
-       {
-               get_string_option("Please enter the full path to your OpenSSL include directory\n"
-                       "(e.g., C:\\openssl\\include, but NOT the openssl subdirectory under include\\)\n"
-                       "(also, path should not end in '\\')",
-                       "C:\\openssl\\include", openssl_inc_path);
-
-               // NOTE: if inspircd ever changes so that it compiles with /MT instead of the /MTd switch, then
-               // the dependency on libeay32mtd.lib and ssleay32mtd.lib will change to just libeay32.lib and
-               // ssleay32.lib. --fez
-
-               get_string_option("Please enter the full path to your OpenSSL library directory\n"
-                       "(e.g., C:\\openssl\\lib, which should contain libeay32mtd.lib and ssleay32mtd.lib)",
-                       "C:\\openssl\\lib", openssl_lib_path);
-
-               // write batch file
-               FILE *fp = fopen("compile_openssl.bat", "w");
-               fprintf(fp, "@echo off\n");
-               fprintf(fp, "echo This batch script compiles m_ssl_openssl for InspIRCd.\n");
-               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, "cd ..\\src\\modules\n");
-               fprintf(fp, "copy extra\\m_ssl_openssl.cpp .\n");
-               fprintf(fp, "echo \t%%COMPILE%%\n");
-               fprintf(fp, "%%COMPILE%%\n");
-               fprintf(fp, "cd ..\\..\\win\n");
-               fprintf(fp, "echo done... now check for errors.\n");
-               fclose(fp);
-
-               printf_c("\033[1;32m!!!NOTICE!!! The file 'compile_openssl.bat' has been written to your 'win' directory.  Launch it\n"
-                       "!!! from the Visual Studio Command Prompt !!! to compile the m_ssl_openssl module.\n"
-                       "Wait until after compiling inspircd to run it.\n"
-                       "Also, ssleay32.dll and libeay32.dll will be required for the IRCd to run.\033[0m\n");
-       }
+       std::cout << std::endl << con_green << "Pre-build configuration is complete!" << std::endl << std::endl;
 
-       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);
+       std::cout << con_reset << "Base install path:\t" << con_green << base_path << std::endl
+       << con_reset << "Config path:\t" << con_green << config_path << std::endl
+       << con_reset << "Module path:\t" << con_green << mod_path << std::endl
+       << con_reset << "Data path:\t"<< con_green << data_path << std::endl
+       << con_reset << "Log path:\t" << con_green << log_path << std::endl
+       << con_reset << "Socket Engine:\t" << con_green << "select" << con_reset << std::endl;
+
        if(get_bool_option("Are these settings correct?", true) == false)
        {
                Run();
                return;
        }
-       printf("\n");
+       std::cout << std::endl;
 
        // escape the pathes
-       escape_string(config_file, MAX_PATH);
-       escape_string(mod_path, MAX_PATH);
-       escape_string(library_dir, MAX_PATH);
+       escape_string(data_path);
+       escape_string(log_path);
+       escape_string(config_path);
+       escape_string(mod_path);
 
        printf("\nWriting inspircd_config.h...");
-       FILE * f = fopen("inspircd_config.h", "w");
+       FILE * f = fopen("..\\include\\inspircd_config.h", "w");
        fprintf(f, "/* Auto generated by configure, do not modify! */\n");
        fprintf(f, "#ifndef __CONFIGURATION_AUTO__\n");
        fprintf(f, "#define __CONFIGURATION_AUTO__\n\n");
-       if(use_iocp)
-               fprintf(f, "#define CONFIG_USE_IOCP 1\n\n");
-       if (ipv6)
-               fprintf(f, "#define IPV6 1\n\n");
 
-       fprintf(f, "#define CONFIG_FILE \"%s/inspircd.conf\"\n", config_file);
-       fprintf(f, "#define MOD_PATH \"%s\"\n", mod_path);
+       fprintf(f, "#define CONFIG_PATH \"%s\"\n", config_path.c_str());
+       fprintf(f, "#define MOD_PATH \"%s\"\n", mod_path.c_str());
+       fprintf(f, "#define DATA_PATH \"%s\"\n", data_path.c_str());
+       fprintf(f, "#define LOG_PATH \"%s\"\n", log_path.c_str());
        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);
-       GetVersionEx(&vi);
-#ifdef WIN64
-       fprintf(f, "#define SYSTEM \"Windows_x64 %u.%u.%u %s\"\n", vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber, vi.szCSDVersion);
-#else
-       fprintf(f, "#define SYSTEM \"Windows_x32 %u.%u.%u %s\"\n", vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber, vi.szCSDVersion);
-#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 \"threadengines/threadengine_win32.h\"\n\n");
        fprintf(f, "#endif\n\n");
        fclose(f);
 
-       sc(TGREEN); printf(" done\n"); sc(TNORMAL);
-       printf("Writing inspircd_se_config.h...");
-
-       f = fopen("inspircd_se_config.h", "w");
-       fprintf(f, "/* Auto generated by configure, do not modify or commit to svn! */\n");
-       fprintf(f, "#ifndef __CONFIGURATION_SOCKETENGINE__\n");
-       fprintf(f, "#define __CONFIGURATION_SOCKETENGINE__\n\n");
-       fprintf(f, "#include \"socketengines/socketengine_%s.h\"\n\n", use_iocp ? "iocp" : "select");
-       fprintf(f, "#endif\n\n");
+       std::cout << con_green << "done" << con_reset << std::endl;
+       printf("Writing inspircd_version.h...");
+       f = fopen("..\\include\\inspircd_version.h", "w");
+       fprintf(f, "#define BRANCH \"%s\"\n", branch.c_str());
+       fprintf(f, "#define VERSION \"%s\"\n", version);
+       fprintf(f, "#define REVISION \"%s\"\n", revision.c_str());
+       fprintf(f, "#define SYSTEM \"%s\"\n", machine_text);
        fclose(f);
 
-       sc(TGREEN); printf(" done\n"); sc(TNORMAL);
+       std::cout << con_green << "done" << con_reset << std::endl;
        printf("Writing command and module compilation scripts...");
        WriteCompileCommands();
-       WriteCompileModules();
-       sc(TGREEN); printf(" done\n"); sc(TNORMAL);
+       WriteCompileModules(extra_include_paths, extra_lib_paths);
+       std::cout << con_green << "done" << con_reset << std::endl;
 
        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_DATAA fd;
+       HANDLE fh = FindFirstFileA("..\\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);
+                       CopyFileA(src, dest, false);
+                       std::cout << con_green << "\t" << fd.cFileName << con_reset << "..." << std::endl;
+               }
+       }
+       while (FindNextFileA(fh, &fd));
+
+       FindClose(fh);
+
+       printf("\n\n");
+}
+
 void WriteCompileCommands()
 {
        char commands[300][100];
        int command_count = 0;
        printf("\n  Finding Command Sources...\n");
-       WIN32_FIND_DATA fd;
-       HANDLE fh = FindFirstFile("..\\src\\commands\\cmd_*.cpp", &fd);
+       WIN32_FIND_DATAA fd;
+       HANDLE fh = FindFirstFileA("..\\src\\commands\\cmd_*.cpp", &fd);
        if(fh == INVALID_HANDLE_VALUE)
-               printf_c("\033[1;32m  No command sources could be found! This \033[1m*could*\033[1;32m be a bad thing.. :P\033[0m");
+               std::cout << con_green << "  No command sources could be found! This *could* be a bad thing.. :P" << con_reset << std::endl;
        else
        {
-               sc(TGREEN);
+               std::cout << con_green;
                do 
                {
                        strcpy(commands[command_count], fd.cFileName);
                        commands[command_count][strlen(fd.cFileName) - 4] = 0;
                        printf("        %s\n", commands[command_count]);
                        ++command_count;
-               } while(FindNextFile(fh, &fd));
-               sc(TNORMAL);
+               } while(FindNextFileA(fh, &fd));
+               std::cout << con_reset;
        }
        
        // Write our spiffy new makefile :D
@@ -453,38 +451,28 @@ void WriteCompileCommands()
                fprintf(f, "%s.so ", commands[i]);
 
        fprintf(f, "\n.cpp.obj:\n");
-#ifdef WIN64
+#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");
-               CreateDirectory("..\\src\\debug", NULL);
-               CreateDirectory("..\\bin\\debug\\bin", NULL);
-               CreateDirectory("..\\bin\\debug\\lib", NULL);
-               CreateDirectory("..\\bin\\debug\\modules", NULL);
+               fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /RTC1 /MDd /Fo\"Debug_x64/\" /Fd\"Debug_x64/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");
        #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");
-               CreateDirectory("..\\src\\release", NULL);
-               CreateDirectory("..\\bin\\release\\bin", NULL);
-               CreateDirectory("..\\bin\\release\\lib", NULL);
-               CreateDirectory("..\\bin\\release\\modules", NULL);
+               fprintf(f, "  cl /nologo /LD /O2 /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GL /MD /Fo\"Release_x64/\" /Fd\"Release_x64/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");
        #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");
-               CreateDirectory("..\\src\\debug", NULL);
-               CreateDirectory("..\\bin\\debug\\bin", NULL);
-               CreateDirectory("..\\bin\\debug\\lib", NULL);
-               CreateDirectory("..\\bin\\debug\\modules", NULL);
+               fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\inspircd.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");
        #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");
-               CreateDirectory("..\\src\\release", NULL);
-               CreateDirectory("..\\bin\\release\\bin", NULL);
-               CreateDirectory("..\\bin\\release\\lib", NULL);
-               CreateDirectory("..\\bin\\release\\modules", NULL);
+               fprintf(f, "  cl /nologo /LD /O2 /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GL /MD /Fo\"Release/\" /Fd\"Release/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\inspircd.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");
        #endif
 #endif
 
-       fprintf(f, "makedir:\n  if not exist debug mkdir debug\n  if not exist release mkdir release\n\n");
+       fprintf(f, "makedir:\n");
+
+       CreateDirectoryA("..\\src\\commands\\" OUTFOLDER, NULL);
+       CreateDirectoryA("..\\bin\\" OUTFOLDER "\\modules", NULL);
+       fprintf(f, "    if not exist ..\\..\\bin\\" OUTFOLDER "\\modules mkdir ..\\..\\bin\\" OUTFOLDER "\\modules\n");
+       fprintf(f, "    if not exist ..\\..\\bin\\" OUTFOLDER "\\data mkdir ..\\..\\bin\\" OUTFOLDER "\\data\n");
+       fprintf(f, "    if not exist ..\\..\\bin\\" OUTFOLDER "\\logs mkdir ..\\..\\bin\\" OUTFOLDER "\\logs\n");
        
        // dump modules.. again the second and last time :)
        for(int i = 0; i < command_count; ++i)
@@ -494,28 +482,34 @@ void WriteCompileCommands()
        fclose(f);
 }
 
-void WriteCompileModules()
+void WriteCompileModules(const vector<string> &includes, const vector<string> &libs)
 {
        char modules[300][100];
        int module_count = 0;
 
        printf("Finding Modules...\n");
-       WIN32_FIND_DATA fd;
-       HANDLE fh = FindFirstFile("..\\src\\modules\\m_*.cpp", &fd);
+       WIN32_FIND_DATAA fd;
+       HANDLE fh = FindFirstFileA("..\\src\\modules\\m_*.cpp", &fd);
        if(fh == INVALID_HANDLE_VALUE)
-               printf_c("\033[1;32m  No module sources could be found! This \033[1m*could*\033[1;32m be a bad thing.. :P\033[0m");
+               std::cout << con_green << "  No module sources could be found! This *could* be a bad thing.. :P" << con_reset << std::endl;
        else
        {
-               sc(TGREEN);
+               std::cout << con_green;
                do 
                {
                        strcpy(modules[module_count], fd.cFileName);
                        modules[module_count][strlen(fd.cFileName) - 4] = 0;
                        printf("  %s\n", modules[module_count]);
                        ++module_count;
-               } while(FindNextFile(fh, &fd));
-               sc(TNORMAL);
+               } while(FindNextFileA(fh, &fd));
+               std::cout << con_reset;
        }
+       
+       string extra_include, extra_lib;
+       for (unsigned i = 0; i < includes.size(); ++i)
+               extra_include += " /I \"" + includes[i] + "\" ";
+       for (unsigned i = 0; i < libs.size(); ++i)
+               extra_lib += " /LIBPATH:\"" + libs[i] + "\" ";
 
        // Write our spiffy new makefile :D
        // I am such a lazy fucker :P
@@ -530,32 +524,28 @@ void WriteCompileModules()
                fprintf(f, "%s.so ", modules[i]);
 
        fprintf(f, "\n.cpp.obj:\n");
-#ifdef WIN64
+#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");
-               CreateDirectory("..\\src\\modules\\debug_x64", NULL);
+               fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" %s /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /RTC1 /MDd /Fo\"Debug_x64/\" /Fd\"Debug_x64/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link %s ..\\..\\bin\\debug_x64\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n", extra_include.c_str(), extra_lib.c_str());
        #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");
-               CreateDirectory("..\\src\\modules\\release_x64", NULL);
+               fprintf(f, "  cl /nologo /LD /O2 /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" %s /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GL /MD /Fo\"Release_x64/\" /Fd\"Release_x64/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link %s ..\\..\\bin\\release_x64\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n", extra_include.c_str(), extra_lib.c_str());
        #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");
-               CreateDirectory("..\\src\\modules\\debug", NULL);
-               CreateDirectory("..\\src\\modules\\debug\\lib", NULL);
-               CreateDirectory("..\\src\\modules\\debug\\modules", NULL);
-               CreateDirectory("..\\src\\modules\\debug\\bin", NULL);
+               fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" %s /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link %s ..\\..\\bin\\debug\\inspircd.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n", extra_include.c_str(), extra_lib.c_str());
        #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");
-               CreateDirectory("..\\src\\modules\\release", NULL);
-               CreateDirectory("..\\src\\modules\\release\\lib", NULL);
-               CreateDirectory("..\\src\\modules\\release\\modules", NULL);
-               CreateDirectory("..\\src\\modules\\release\\bin", NULL);
+               fprintf(f, "  cl /nologo /LD /O2 /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" %s /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GL /MD /Fo\"Release/\" /Fd\"Release/vc90.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link %s ..\\..\\bin\\release\\inspircd.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n", extra_include.c_str(), extra_lib.c_str());
        #endif
 #endif
+
+       CreateDirectoryA("..\\src\\modules\\" OUTFOLDER, NULL);
        
-       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\n");
+#else
+       fprintf(f, "makedir:\n  if not exist release mkdir release\n\n");
+#endif
 
        // dump modules.. again the second and last time :)
        for(int i = 0; i < module_count; ++i)