]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - win/configure.cpp
Merge pull request #437 from SaberUK/insp20+doxygen-update
[user/henk/code/inspircd.git] / win / configure.cpp
index 7c9a278544755dd2d956a8b7ae6c839024c1b308..6f821894b53103c445648e4ff74181e533cb4535 100644 (file)
@@ -1,16 +1,27 @@
-/*        +------------------------------------+
- *        | Inspire Internet Relay Chat Daemon |
- *        +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2011 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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
 #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(const vector<string> &, const vector<string> &);
 void WriteCompileCommands();
-void Rebase();
 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;
 }
 
@@ -62,28 +80,28 @@ 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);
 }
 
 string get_string_option(const char * text, char * def)
 {
        if (def && *def)
-               printf_c("%s\n[\033[1;32m%s\033[0m] -> ", text, def);
+               std::cout << text << std::endl << "[" << con_green << def << con_reset << "] -> ";
        else
-               printf_c("%s\n[] -> ", text);
+               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;
 }
 
@@ -133,7 +151,7 @@ string get_git_commit()
                fclose(f);
        }
 
-       return commit != NULL ? commit : "";
+       return commit != NULL ? commit : "0";
 }
 
 void get_machine_info(char * buffer, size_t len)
@@ -142,15 +160,15 @@ void get_machine_info(char * buffer, size_t len)
        char buf2[500];
 
        DWORD dwSize = sizeof(buf);
-       if (!GetComputerNameEx((COMPUTER_NAME_FORMAT)ComputerNameDnsFullyQualified, buf, &dwSize))
+       if (!GetComputerNameExA((COMPUTER_NAME_FORMAT)ComputerNameDnsFullyQualified, buf, &dwSize))
                sprintf(buf, "%s", "unknown");
 
        FILE * f = fopen("ver.txt.tmp", "r");
        if (f)
        {
-               while (fgets(buf2, 500, f)) { }
+               while (fgets(buf2, sizeof(buf2), f)) { }
                fclose(f);
-               unlink("ver.txt.tmp");
+               _unlink("ver.txt.tmp");
        }
        else
                sprintf(buf2, "%s", "unknown");
@@ -173,7 +191,7 @@ void get_machine_info(char * buffer, size_t len)
 
 vector<string> get_dir_list(const string &path_list)
 {
-       char *paths = strdup(path_list.c_str());
+       char *paths = _strdup(path_list.c_str());
        char *paths_save = paths;
        char *p = paths;
        vector<string> paths_return;
@@ -193,16 +211,10 @@ vector<string> get_dir_list(const string &path_list)
 
 int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPSTR lpCmdLine, IN int nShowCmd )
 {
-       if (!strcmp(lpCmdLine, "/rebase"))
-       {
-               Rebase();
-               return 0;
-       }
-
-       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);
@@ -219,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();
@@ -227,14 +253,14 @@ 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;
 
 }
 
@@ -250,8 +276,8 @@ void Run()
        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;
@@ -264,15 +290,19 @@ 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.empty() ? revision.c_str() : "(Non-GIT build)");
-       
-       printf_c("\033[1mExtra modules.\033[0m\n");
+       << 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))
        {
                string extra_i_path = get_string_option("Extra include search paths separate by \";\"", ".");
@@ -282,74 +312,71 @@ void Run()
                extra_lib_paths = get_dir_list(extra_l_path);
        }
 
-       printf_c("\033[1mAll paths are relative to the binary directory.\033[0m\n");
+       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_file = get_string_option("In what directory are the configuration files?", "conf");
+       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?", ".");
 
-       printf_c("\n\033[1;32mPre-build configuration is complete!\n\n");       sc(TNORMAL);
+       std::cout << std::endl << con_green << "Pre-build configuration is complete!" << std::endl << std::endl;
 
        CopyExtras();
 
        // dump all the options back out
-       printf_c("\033[0mBase install path:\033[1;32m        %s\n", base_path.c_str());
-       printf_c("\033[0mConfig path:\033[1;32m              %s\n", config_file.c_str());
-       printf_c("\033[0mModule path:\033[1;32m              %s\n", mod_path.c_str());
-       printf_c("\033[0mSocket Engine:\033[1;32m            %s\n", "select");
+       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;
 
-       printf("\n"); sc(TNORMAL);
        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);
+       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");
 
+       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 MAXBUF 514\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);
 
-       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 Git! */\n");
-       fprintf(f, "#ifndef __CONFIGURATION_SOCKETENGINE__\n");
-       fprintf(f, "#define __CONFIGURATION_SOCKETENGINE__\n\n");
-       fprintf(f, "#include \"socketengines/socketengine_%s.h\"\n\n", "select");
-       fprintf(f, "#endif\n\n");
-       fclose(f);
-
-       sc(TGREEN); printf(" done\n"); sc(TNORMAL);
+       std::cout << con_green << "done" << con_reset << std::endl;
        printf("Writing inspircd_version.h...");
-       f = fopen("inspircd_version.h", "w");
+       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(extra_include_paths, extra_lib_paths);
-       sc(TGREEN); printf(" done\n"); sc(TNORMAL);
+       std::cout << con_green << "done" << con_reset << std::endl;
 
        printf("\nconfigure is done.. exiting!\n");
 }
@@ -362,8 +389,8 @@ void CopyExtras()
 
        printf("\nUpdating extra modules in src/modules...\n");
 
-       WIN32_FIND_DATA fd;
-       HANDLE fh = FindFirstFile("..\\src\\modules\\extra\\*.*", &fd);
+       WIN32_FIND_DATAA fd;
+       HANDLE fh = FindFirstFileA("..\\src\\modules\\extra\\*.*", &fd);
 
        if(fh == INVALID_HANDLE_VALUE)
                return;
@@ -378,74 +405,37 @@ void CopyExtras()
                if (x)
                {
                        fclose(x);
-                       CopyFile(src, dest, false);
-                       sc(TGREEN); printf("    %s", fd.cFileName); sc(TNORMAL);
-                       printf("...\n");
+                       CopyFileA(src, dest, false);
+                       std::cout << con_green << "\t" << fd.cFileName << con_reset << "..." << std::endl;
                }
        }
-       while (FindNextFile(fh, &fd));
+       while (FindNextFileA(fh, &fd));
 
        FindClose(fh);
 
        printf("\n\n");
 }
 
-
-void Rebase()
-{
-       char dest[65535];
-       char command[65535];
-
-       WIN32_FIND_DATA fd;
-
-#ifdef _DEBUG
-       HANDLE fh = FindFirstFile("..\\bin\\debug\\modules\\*.so", &fd);
-#else
-       HANDLE fh = FindFirstFile("..\\bin\\release\\modules\\*.so", &fd);
-#endif
-       if(fh == INVALID_HANDLE_VALUE)
-               return;
-
-       *dest = 0;
-
-       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 11000000 -c baseaddr_modules.txt %s", dest);
-       printf("%s\n", command);
-       system(command);
-
-       FindClose(fh);
-}
-
 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
@@ -461,41 +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 /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/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");
-               CreateDirectory("..\\src\\commands\\debug", 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\" /Gm /EHsc /GL /MD /Fo\"Release/\" /Fd\"Release/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");
-               CreateDirectory("..\\src\\commands\\release", 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 /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");
-               CreateDirectory("..\\src\\commands\\debug", 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\" /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");
-               CreateDirectory("..\\src\\commands\\release", 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");
-#ifdef _DEBUG
-       fprintf(f, "    if not exist ..\\..\\bin\\debug mkdir ..\\..\\bin\\debug\n");
-       fprintf(f, "    if not exist ..\\..\\bin\\debug\\modules mkdir ..\\..\\bin\\debug\\modules\n");
-       fprintf(f, "    if not exist ..\\..\\bin\\debug\\data mkdir ..\\..\\bin\\debug\\data\n");
-       fprintf(f, "    if not exist ..\\..\\bin\\debug\\logs mkdir ..\\..\\bin\\debug\\logs\n");
-#else
-       fprintf(f, "    if not exist ..\\..\\bin\\release mkdir ..\\..\\bin\\release\n");
-       fprintf(f, "    if not exist ..\\..\\bin\\release\\modules mkdir ..\\..\\bin\\release\\modules\n");
-       fprintf(f, "    if not exist ..\\..\\bin\\release\\data mkdir ..\\..\\bin\\release\\data\n");
-       fprintf(f, "    if not exist ..\\..\\bin\\release\\logs mkdir ..\\..\\bin\\release\\logs\n");
-#endif
+
+       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)
@@ -511,21 +488,21 @@ void WriteCompileModules(const vector<string> &includes, const vector<string> &l
        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;
@@ -547,24 +524,22 @@ void WriteCompileModules(const vector<string> &includes, const vector<string> &l
                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\" %s /D \"WIN32\" /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_x64\\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", extra_include.c_str(), extra_lib.c_str());
-               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\" %s /D \"WIN32\" /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_x64\\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", extra_include.c_str(), extra_lib.c_str());
-               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 /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" %s /D \"WIN32\" /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 ws2_32.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());
-               CreateDirectory("..\\src\\modules\\debug", 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 /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" %s /D \"WIN32\" /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 ws2_32.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());
-               CreateDirectory("..\\src\\modules\\release", 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);
        
 #ifdef _DEBUG
        fprintf(f, "makedir:\n  if not exist debug mkdir debug\n\n");