X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Fconfigure.cpp;h=2cbb43da35425ef9f93ffa952f67d72405d6898e;hb=fa67c7e80b15060773295e4719545a802d8717d5;hp=3f63841ecde0ae2fc4377962496669724a388759;hpb=a7f13680d2597d2012d13e1ae706af5af586e0da;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/configure.cpp b/win/configure.cpp index 3f63841ec..2cbb43da3 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -1,21 +1,23 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | 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. + * the file COPYING for details. * * --------------------------------------------------- */ #define _CRT_SECURE_NO_DEPRECATE +#define CONFIGURE_BUILD #define WIN32_LEAN_AND_MEAN #include #include +#include #include #include #include "inspircd_win32wrapper.h" @@ -26,6 +28,8 @@ void Run(); void Banner(); void WriteCompileModules(); void WriteCompileCommands(); +void Rebase(); +void CopyExtras(); /* detects if we are running windows xp or higher (5.1) */ bool iswinxp() @@ -84,7 +88,7 @@ bool escape_string(char * str, size_t size) { size_t len = strlen(str); char * d_str = (char*)malloc(len * 2); - + size_t i = 0; size_t j = 0; @@ -103,7 +107,7 @@ bool escape_string(char * str, size_t size) d_str[j++] = 0; - if(j > size) + if(j > size) { free(d_str); return false; @@ -125,27 +129,65 @@ int get_svn_revision(char * buffer, size_t len) 7033 */ char buf[1000]; + int rev = 0; + FILE * f = fopen("..\\.svn\\entries", "r"); - if(!f) goto bad_rev; - - if(!fgets(buf, 1000, f)) goto bad_rev; - if(!fgets(buf, 1000, f)) goto bad_rev; - if(!fgets(buf, 1000, f)) goto bad_rev; - if(!fgets(buf, 1000, f)) goto bad_rev; - int rev = atoi(buf); - if(rev == 0) goto bad_rev; - sprintf(buffer, "%u", rev); - fclose(f); - return rev; + if (f) + { + for (int q = 0; q < 4; ++q) + fgets(buf, 1000, f); + + rev = atoi(buf); + sprintf(buffer, "%u", rev); + fclose(f); + } -bad_rev: - strcpy(buffer, "non-svn"); - if(f) fclose(f); - return 0; + return rev; +} + +void get_machine_info(char * buffer, size_t len) +{ + char buf[500]; + char buf2[500]; + + DWORD dwSize = sizeof(buf); + if (!GetComputerNameEx((COMPUTER_NAME_FORMAT)ComputerNameDnsFullyQualified, buf, &dwSize)) + sprintf(buf, "%s", "unknown"); + + FILE * f = fopen("ver.txt.tmp", "r"); + if (f) + { + while (fgets(buf2, 500, f)) { } + fclose(f); + unlink("ver.txt.tmp"); + } + else + sprintf(buf2, "%s", "unknown"); + + 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; } 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"); if (j) { @@ -156,6 +198,9 @@ int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPS } } + // call before we hook console handles + system("ver > ver.txt.tmp"); + AllocConsole(); // pipe standard handles to this console @@ -173,8 +218,8 @@ 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" + 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\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" @@ -184,10 +229,8 @@ void Banner() void Run() { - int max_fd = 1024; - bool use_iocp = false; - bool support_ip6links = false; bool use_openssl = false; + bool ipv6 = true; char mod_path[MAX_PATH]; char config_file[MAX_PATH]; char library_dir[MAX_PATH]; @@ -196,19 +239,10 @@ void Run() char revision_text[MAX_PATH]; char openssl_inc_path[MAX_PATH]; char openssl_lib_path[MAX_PATH]; - - int max_clients = 1024; - 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]; + char machine_text[MAX_PATH]; + get_machine_info(machine_text, MAX_PATH); // grab version FILE * fI = fopen("..\\src\\version.sh", "r"); @@ -236,21 +270,8 @@ void Run() #endif printf_c("InspIRCd revision ID: \033[1;32m%s \033[0m\n\n", revision ? revision_text : "(Non-SVN build)"); - max_fd = get_int_option("What is the maximum file descriptor count you would like to allow?", 1024); - - // detect windows - if(iswinxp()) - { - printf_c("You are running Windows 2000 or above, and IOCP support is most likely available.\n" - "This removes the socket number limitation of select and is much more efficent.\n" - "If you are unsure, answer yes.\n\n"); + ipv6 = get_bool_option("Do you want to enable IPv6?", false); - use_iocp = get_bool_option("Do you want to use the IOCP implementation?", true); - } - - 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); - 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); @@ -258,26 +279,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"); - - - max_clients = get_int_option("Please enter the maximum number of clients at any one time?", 1024); - 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 @@ -308,7 +309,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 /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /MD /Fo\"Release/\" /Fd\"Release/vc90.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"); @@ -325,23 +326,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 file descriptors:\033[1;32m %u\n", max_fd); - printf_c("\033[0mMax connections:\033[1;32m %u\n", max_clients); - 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_c("\033[0mSocket Engine:\033[1;32m %s\n", "select"); + printf("\n"); sc(TNORMAL); if(get_bool_option("Are these settings correct?", true) == false) { @@ -360,41 +353,18 @@ void Run() 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 MAX_DESCRIPTORS %u\n", max_fd); - fprintf(f, "#define MAXCLIENTS %u\n", max_clients); - fprintf(f, "#define MAXCLIENTS_S \"%u\"\n", max_clients); 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, "\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); @@ -405,10 +375,18 @@ void Run() 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, "#include \"socketengines/socketengine_%s.h\"\n\n", "select"); fprintf(f, "#endif\n\n"); fclose(f); + sc(TGREEN); printf(" done\n"); sc(TNORMAL); + printf("Writing inspircd_version.h..."); + f = fopen("inspircd_version.h", "w"); + fprintf(f, "#define VERSION \"%s\"\n", version); + fprintf(f, "#define REVISION \"%d\"\n", revision); + fprintf(f, "#define SYSTEM \"%s\"\n", machine_text); + fclose(f); + sc(TGREEN); printf(" done\n"); sc(TNORMAL); printf("Writing command and module compilation scripts..."); WriteCompileCommands(); @@ -418,6 +396,105 @@ 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]; + char command[65535]; + + *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)); + + FindClose(fh); + + sprintf(command, "rebase.exe -v -b 10000000 -c baseaddr_commands.txt %s", dest); + 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; + + *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]; @@ -434,12 +511,12 @@ void WriteCompileCommands() { strcpy(commands[command_count], fd.cFileName); commands[command_count][strlen(fd.cFileName) - 4] = 0; - printf(" %s\n", commands[command_count]); + printf(" %s\n", commands[command_count]); ++command_count; } while(FindNextFile(fh, &fd)); sc(TNORMAL); } - + // Write our spiffy new makefile :D // I am such a lazy fucker :P FILE * f = fopen("..\\src\\commands\\commands.mak", "w"); @@ -456,13 +533,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 /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc90.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\" /Gm /EHsc /GL /MD /Fo\"Release/\" /Fd\"Release/vc90.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); @@ -470,13 +547,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 /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc90.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\" /Gm /EHsc /GL /MD /Fo\"Release/\" /Fd\"Release/vc90.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); @@ -484,7 +561,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) @@ -533,21 +614,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 /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc90.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\" /Gm /EHsc /GL /MD /Fo\"Release/\" /Fd\"Release/vc90.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 /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 /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc90.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 /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /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\\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); @@ -555,7 +636,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)