From 699a8b2fc82949bfd5a39acc5b00670a5c350b4d Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 18 Jun 2011 17:25:35 -0400 Subject: [PATCH] Fix extras compilation under Windows --- src/modules/extra/m_geoip.cpp | 11 +- src/modules/extra/m_ldapauth.cpp | 5 + src/modules/extra/m_ldapoper.cpp | 5 + src/modules/extra/m_mysql.cpp | 4 +- src/modules/extra/m_regex_pcre.cpp | 2 +- src/modules/extra/m_ssl_gnutls.cpp | 8 +- src/modules/extra/m_ssl_openssl.cpp | 13 +- win/colours.h | 2 +- win/configure.cpp | 211 +- win/inspircd-noextras.nsi | 228 - win/inspircd.nsi | 33 +- win/inspircdVC90.vcproj | 7382 +++++++-------------------- win/inspircdVC90.vcxproj | 1560 ++---- win/inspircd_memory_functions.cpp | 2 +- win/inspircd_win32wrapper.cpp | 14 +- win/inspircd_win32wrapper.h | 2 +- win/m_spanningtreeVC90.vcxproj | 576 +-- win/win32service.cpp | 2 +- 18 files changed, 2759 insertions(+), 7301 deletions(-) delete mode 100644 win/inspircd-noextras.nsi diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp index cdd269003..5b78be88b 100644 --- a/src/modules/extra/m_geoip.cpp +++ b/src/modules/extra/m_geoip.cpp @@ -16,6 +16,10 @@ #include +#ifdef WINDOWS +# pragma comment(lib, "GeoIP.lib") +#endif + /* $ModDesc: Provides a way to restrict users by country using GeoIP lookup */ /* $LinkerFlags: -lGeoIP */ @@ -25,13 +29,16 @@ class ModuleGeoIP : public Module GeoIP* gi; public: - ModuleGeoIP() : ext("geoip_cc", this) + ModuleGeoIP() : ext("geoip_cc", this), gi(NULL) { - gi = GeoIP_new(GEOIP_STANDARD); } void init() { + gi = GeoIP_new(GEOIP_STANDARD); + if (gi == NULL) + throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?"); + ServerInstance->Modules->AddService(ext); Implementation eventlist[] = { I_OnSetConnectClass }; ServerInstance->Modules->Attach(eventlist, this, 1); diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp index 85a0181c4..4fae7a2e7 100644 --- a/src/modules/extra/m_ldapauth.cpp +++ b/src/modules/extra/m_ldapauth.cpp @@ -28,6 +28,11 @@ #include +#ifdef WINDOWS +# pragma comment(lib, "ldap.lib") +# pragma comment(lib, "lber.lib") +#endif + /* $ModDesc: Allow/Deny connections based upon answer from LDAP server */ /* $LinkerFlags: -lldap */ diff --git a/src/modules/extra/m_ldapoper.cpp b/src/modules/extra/m_ldapoper.cpp index 45f03aa8e..77e5989db 100644 --- a/src/modules/extra/m_ldapoper.cpp +++ b/src/modules/extra/m_ldapoper.cpp @@ -28,6 +28,11 @@ #include +#ifdef WINDOWS +# pragma comment(lib, "ldap.lib") +# pragma comment(lib, "lber.lib") +#endif + /* $ModDesc: Allow/Deny connections based upon answer from LDAP server */ /* $LinkerFlags: -lldap */ diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 1eb65794d..d9df1ed61 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -19,7 +19,9 @@ #include "sql.h" #ifdef WINDOWS -#pragma comment(lib, "mysqlclient.lib") +# pragma comment(lib, "mysqlclient.lib") +# pragma comment(lib, "advapi32.lib") +# pragma comment(linker, "/NODEFAULTLIB:LIBCMT") #endif /* VERSION 3 API: With nonblocking (threaded) requests */ diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index 095513782..99f62a2c2 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -21,7 +21,7 @@ /* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */ #ifdef WINDOWS -#pragma comment(lib, "pcre.lib") +# pragma comment(lib, "libpcre.lib") #endif class PCREException : public ModuleException diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index ff7a1654b..95638417b 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -18,10 +18,6 @@ #include "ssl.h" #include "m_cap.h" -#ifdef WINDOWS -#pragma comment(lib, "libgnutls-13.lib") -#endif - /* $ModDesc: Provides SSL support for clients */ /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */ /* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */ @@ -50,7 +46,7 @@ static ssize_t gnutls_pull_wrapper(gnutls_transport_ptr_t user_wrap, void* buffe errno = EAGAIN; return -1; } - int rv = recv(user->GetFd(), buffer, size, 0); + int rv = recv(user->GetFd(), reinterpret_cast(buffer), size, 0); if (rv < (int)size) ServerInstance->SE->ChangeEventMask(user, FD_READ_WILL_BLOCK); return rv; @@ -64,7 +60,7 @@ static ssize_t gnutls_push_wrapper(gnutls_transport_ptr_t user_wrap, const void* errno = EAGAIN; return -1; } - int rv = send(user->GetFd(), buffer, size, 0); + int rv = send(user->GetFd(), reinterpret_cast(buffer), size, 0); if (rv < (int)size) ServerInstance->SE->ChangeEventMask(user, FD_WRITE_WILL_BLOCK); return rv; diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index d163cebb7..7cae1a344 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -17,10 +17,15 @@ #include "ssl.h" #ifdef WINDOWS -#pragma comment(lib, "libeay32MTd") -#pragma comment(lib, "ssleay32MTd") -#undef MAX_DESCRIPTORS -#define MAX_DESCRIPTORS 10000 +# pragma comment(lib, "libcrypto.lib") +# pragma comment(lib, "libssl.lib") +# pragma comment(lib, "user32.lib") +# pragma comment(lib, "advapi32.lib") +# pragma comment(lib, "libgcc.lib") +# pragma comment(lib, "libmingwex.lib") +# pragma comment(lib, "gdi32.lib") +# undef MAX_DESCRIPTORS +# define MAX_DESCRIPTORS 10000 #endif /* $ModDesc: Provides SSL support for clients */ diff --git a/win/colours.h b/win/colours.h index c0bccd249..d266fe434 100644 --- a/win/colours.h +++ b/win/colours.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2011 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see diff --git a/win/configure.cpp b/win/configure.cpp index 249e0cf9a..4acd7131b 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2011 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -18,7 +18,9 @@ #include #include #include +#include #include +#include #include #include "inspircd_win32wrapper.h" #include "colours.h" @@ -26,7 +28,7 @@ using namespace std; void Run(); void Banner(); -void WriteCompileModules(); +void WriteCompileModules(const vector &, const vector &); void WriteCompileCommands(); void Rebase(); void CopyExtras(); @@ -69,53 +71,34 @@ bool get_bool_option(const char * text, bool def) return !strncmp(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) + if (def && *def) printf_c("%s\n[\033[1;32m%s\033[0m] -> ", text, def); else printf_c("%s\n[] -> ", text); - fgets(buffer, 500, stdin); - if(sscanf(buffer, "%s", buf) != 1) + + char buffer[1000], buf[1000]; + fgets(buffer, sizeof(buffer), stdin); + if (sscanf(buffer, "%s", buf) != 1) strcpy(buf, def); - + printf("\n"); + 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(; i < len; ++i) + for (unsigned i = 0; i < copy.size(); ++i) { - if(str[i] == '\\') - { - d_str[j++] = '\\'; - d_str[j++] = '\\'; - } - else - { - d_str[j++] = str[i]; - } + str += copy[i]; + if (copy[i] == '\\') + str += '\\'; } - - d_str[j++] = 0; - - if(j > size) - { - free(d_str); - return false; - } - - strcpy(str, d_str); - free(d_str); - return true; } string get_git_commit() @@ -188,6 +171,26 @@ void get_machine_info(char * buffer, size_t len) *b = 0; } +vector get_dir_list(const string &path_list) +{ + char *paths = strdup(path_list.c_str()); + char *paths_save = paths; + char *p = paths; + vector paths_return; + + while ((p = strchr(paths, ';'))) + { + *p++ = 0; + paths_return.push_back(paths); + paths = p; + } + if (paths != NULL) + paths_return.push_back(paths); + free(paths_save); + + return paths_return; +} + int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPSTR lpCmdLine, IN int nShowCmd ) { if (!strcmp(lpCmdLine, "/rebase")) @@ -237,14 +240,7 @@ void Banner() void Run() { - bool use_openssl = false; - bool ipv6 = true; - char mod_path[MAX_PATH]; - char config_file[MAX_PATH]; - char base_path[MAX_PATH]; - char bin_dir[MAX_PATH]; - char openssl_inc_path[MAX_PATH]; - char openssl_lib_path[MAX_PATH]; + vector extra_include_paths, extra_lib_paths; string revision = get_git_commit(); char version[514]; char machine_text[MAX_PATH]; @@ -275,68 +271,31 @@ void Run() printf_c("Your operating system is: \033[1;32mwindows_x32 \033[0m\n"); #endif printf_c("InspIRCd revision ID: \033[1;32m%s \033[0m\n\n", !revision.empty() ? revision.c_str() : "(Non-GIT build)"); - - ipv6 = get_bool_option("Do you want to enable IPv6?", false); - - 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); - - // 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) + + printf_c("\033[1mExtra modules.\033[0m\n"); + if (get_bool_option("Do you want to compile any extra non-core modules?", false)) { - 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 /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"); - 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"); + 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); } + printf_c("\033[1mAll paths are relative to the binary directory.\033[0m\n"); + 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 mod_path = get_string_option("In what directory are the modules to be compiled to?", "modules"); + 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); 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[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"); printf("\n"); sc(TNORMAL); @@ -348,8 +307,8 @@ void Run() printf("\n"); // escape the pathes - escape_string(config_file, MAX_PATH); - escape_string(mod_path, MAX_PATH); + escape_string(config_file); + escape_string(mod_path); printf("\nWriting inspircd_config.h..."); FILE * f = fopen("inspircd_config.h", "w"); @@ -357,7 +316,7 @@ void Run() fprintf(f, "#ifndef __CONFIGURATION_AUTO__\n"); fprintf(f, "#define __CONFIGURATION_AUTO__\n\n"); - fprintf(f, "#define MOD_PATH \"%s\"\n", mod_path); + fprintf(f, "#define MOD_PATH \"%s\"\n", mod_path.c_str()); fprintf(f, "#define SOMAXCONN_S \"128\"\n"); fprintf(f, "#define MAXBUF 514\n"); @@ -389,7 +348,7 @@ void Run() sc(TGREEN); printf(" done\n"); sc(TNORMAL); printf("Writing command and module compilation scripts..."); WriteCompileCommands(); - WriteCompileModules(); + WriteCompileModules(extra_include_paths, extra_lib_paths); sc(TGREEN); printf(" done\n"); sc(TNORMAL); printf("\nconfigure is done.. exiting!\n"); @@ -505,26 +464,22 @@ 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 /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\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n"); - CreateDirectory("..\\src\\debug", NULL); - CreateDirectory("..\\bin\\debug\\bin", NULL); + 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); #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\\bin\\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\\release", NULL); - CreateDirectory("..\\bin\\release\\bin", NULL); + 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); #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\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n"); - CreateDirectory("..\\src\\debug", NULL); - CreateDirectory("..\\bin\\debug\\bin", NULL); + 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); #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\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n"); - CreateDirectory("..\\src\\release", NULL); - CreateDirectory("..\\bin\\release\\bin", NULL); + 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); #endif #endif @@ -533,9 +488,13 @@ void WriteCompileCommands() #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 // dump modules.. again the second and last time :) @@ -546,7 +505,7 @@ void WriteCompileCommands() fclose(f); } -void WriteCompileModules() +void WriteCompileModules(const vector &includes, const vector &libs) { char modules[300][100]; int module_count = 0; @@ -568,6 +527,12 @@ void WriteCompileModules() } while(FindNextFile(fh, &fd)); sc(TNORMAL); } + + 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 @@ -585,30 +550,26 @@ 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 /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"); + 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); #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\" /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"); + 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); #endif #else #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 /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"); + 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); - CreateDirectory("..\\src\\modules\\debug\\modules", NULL); - CreateDirectory("..\\src\\modules\\debug\\bin", 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\" /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"); + 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); - CreateDirectory("..\\src\\modules\\release\\modules", NULL); - CreateDirectory("..\\src\\modules\\release\\bin", NULL); #endif #endif #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"); + fprintf(f, "makedir:\n if not exist debug mkdir debug\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"); + fprintf(f, "makedir:\n if not exist release mkdir release\n\n"); #endif // dump modules.. again the second and last time :) diff --git a/win/inspircd-noextras.nsi b/win/inspircd-noextras.nsi deleted file mode 100644 index c0e0baf6d..000000000 --- a/win/inspircd-noextras.nsi +++ /dev/null @@ -1,228 +0,0 @@ -; * +------------------------------------+ -; * | Inspire Internet Relay Chat Daemon | -; * +------------------------------------+ -; * -; * InspIRCd: (C) 2002-2011 InspIRCd Development Team -; * See: http://wiki.inspircd.org/Credits -; * -; * This program is free but copyrighted software; see -; * the file COPYING for details. -; * -; * --------------------------------------------------- - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - ;;;; SET THE BUILD TO BE PACKAGED HERE ;;;; - -!define BUILD "release" - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "InspIRCd" -!define PRODUCT_VERSION "2.0" -!define PRODUCT_PUBLISHER "InspIRCd Development Team" -!define PRODUCT_WEB_SITE "http://www.inspircd.org/" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\inspircd.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define DOT_MAJOR "2" -!define DOT_MINOR "0" - -SetCompressor bzip2 - -; MUI 1.67 compatible ------ -!include "MUI.nsh" - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "inspircd.ico" -!define MUI_UNICON "inspircd.ico" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -!define MUI_LICENSEPAGE_CHECKBOX -!insertmacro MUI_PAGE_LICENSE "..\docs\COPYING" -; directory page -Page directory -; Components page -!insertmacro MUI_PAGE_COMPONENTS -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "English" - -; Reserve files -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - -; MUI end ------ - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}-Setup.exe" -InstallDir "$PROGRAMFILES\InspIRCd" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -Function IsDotNetInstalled - - StrCpy $0 "0" - StrCpy $1 "SOFTWARE\Microsoft\.NETFramework" ;registry entry to look in. - StrCpy $2 0 - - StartEnum: - ;Enumerate the versions installed. - EnumRegKey $3 HKLM "$1\policy" $2 - - ;If we don't find any versions installed, it's not here. - StrCmp $3 "" noDotNet notEmpty - - ;We found something. - notEmpty: - ;Find out if the RegKey starts with 'v'. - ;If it doesn't, goto the next key. - StrCpy $4 $3 1 0 - StrCmp $4 "v" +1 goNext - StrCpy $4 $3 1 1 - - ;It starts with 'v'. Now check to see how the installed major version - ;relates to our required major version. - ;If it's equal check the minor version, if it's greater, - ;we found a good RegKey. - IntCmp $4 ${DOT_MAJOR} +1 goNext yesDotNetReg - ;Check the minor version. If it's equal or greater to our requested - ;version then we're good. - StrCpy $4 $3 1 3 - IntCmp $4 ${DOT_MINOR} yesDotNetReg goNext yesDotNetReg - - goNext: - ;Go to the next RegKey. - IntOp $2 $2 + 1 - goto StartEnum - - yesDotNetReg: - ;Now that we've found a good RegKey, let's make sure it's actually - ;installed by getting the install path and checking to see if the - ;mscorlib.dll exists. - EnumRegValue $2 HKLM "$1\policy\$3" 0 - ;$2 should equal whatever comes after the major and minor versions - ;(ie, v1.1.4322) - StrCmp $2 "" noDotNet - ReadRegStr $4 HKLM $1 "InstallRoot" - ;Hopefully the install root isn't empty. - StrCmp $4 "" noDotNet - ;build the actuall directory path to mscorlib.dll. - StrCpy $4 "$4$3.$2\mscorlib.dll" - IfFileExists $4 yesDotNet noDotNet - - noDotNet: - MessageBox MB_OK "You do not have have v${DOT_MAJOR}.${DOT_MINOR} or greater of the .NET framework installed. This is required for the InspIRCd Monitor, however you can still launch the IRCd manually." - - yesDotNet: - ;Everything checks out. Go on with the rest of the installation. - -FunctionEnd - -Section "Binary Executable" SEC01 - Call IsDotNetInstalled - CreateDirectory "$SMPROGRAMS\InspIRCd" - CreateDirectory "$INSTDIR\logs" - CreateDirectory "$INSTDIR\data" - CreateShortCut "$SMPROGRAMS\InspIRCd\InspIRCd.lnk" "$INSTDIR\inspircd.exe" - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - File "..\bin\${BUILD}\bin\inspircd.exe" - DetailPrint "Installing InspIRCd service..." - nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\inspircd.exe" --installservice' -SectionEnd - -Section "Config Files" SEC02 - SetOutPath "$INSTDIR\conf" - File "..\docs\*.example" -SectionEnd - -Section "Command Handlers" SEC03 - SetOutPath "$INSTDIR\modules" - File "..\bin\${BUILD}\modules\cmd_*.so" -SectionEnd - -Section "Modules" SEC04 - SetOutPath "$INSTDIR\modules" - File "..\bin\${BUILD}\modules\m_*.so" -SectionEnd - -Section -AdditionalIcons - SetOutPath $INSTDIR - WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" - CreateShortCut "$SMPROGRAMS\InspIRCd\InspIRCd Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" - CreateShortCut "$SMPROGRAMS\InspIRCd\Uninstall.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\inspircd.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\inspircd.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" - MessageBox MB_ICONINFORMATION|MB_OK "InspIRCd was successfully installed. Remember to edit your configuration file in $INSTDIR\conf!" -SectionEnd - -; Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Actual executable" - !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Command modules" - !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Default configuration files" - !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Optional non-SSL modules" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." -FunctionEnd - -Function .onInit - SectionSetFlags ${SEC01} 17 - SectionSetFlags ${SEC03} 17 - StrCpy $INSTDIR "$PROGRAMFILES\InspIRCd" -FunctionEnd - -Function un.onInit - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 - Abort -FunctionEnd - -Section Uninstall - DetailPrint "Uninstalling InspIRCd service..." - nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\inspircd.exe" --removeservice' - Delete "$INSTDIR\${PRODUCT_NAME}.url" - Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\modules\*.so" - Delete "$INSTDIR\conf\*.example" - Delete "$INSTDIR\*.log" - Delete "$INSTDIR\logs\*" - Delete "$INSTDIR\data\*" - Delete "$INSTDIR\inspircd.exe" - Delete "$SMPROGRAMS\InspIRCd\Uninstall.lnk" - Delete "$SMPROGRAMS\InspIRCd\InspIRCd Website.lnk" - Delete "$SMPROGRAMS\InspIRCd\InspIRCd.lnk" - - RMDir "$SMPROGRAMS\InspIRCd" - RMDir "$INSTDIR\modules" - RMDir "$INSTDIR\conf" - RMDir "$INSTDIR\logs" - RMDir "$INSTDIR\data" - RMDir "$INSTDIR" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose true -SectionEnd diff --git a/win/inspircd.nsi b/win/inspircd.nsi index dbd9d5511..421a6492e 100644 --- a/win/inspircd.nsi +++ b/win/inspircd.nsi @@ -136,7 +136,7 @@ Section "Binary Executable" SEC01 CreateShortCut "$SMPROGRAMS\InspIRCd\InspIRCd.lnk" "$INSTDIR\inspircd.exe" SetOutPath "$INSTDIR" SetOverwrite ifnewer - File "..\bin\${BUILD}\bin\inspircd.exe" + File "..\bin\${BUILD}\inspircd.exe" DetailPrint "Installing InspIRCd service..." nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\inspircd.exe" --installservice' SectionEnd @@ -156,34 +156,6 @@ Section "Modules" SEC04 File "..\bin\${BUILD}\modules\m_*.so" SectionEnd -Section "SSL Modules" SEC05 - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - File "..\bin\${BUILD}\bin\libgcrypt-11.dll" - File "..\bin\${BUILD}\bin\libgnutls-13.dll" - File "..\bin\${BUILD}\bin\libgnutls-extra-13.dll" - File "..\bin\${BUILD}\bin\libgnutls-openssl-13.dll" - File "..\bin\${BUILD}\bin\libgpg-error-0.dll" - File "..\bin\${BUILD}\bin\libopencdk-8.dll" - File "..\bin\${BUILD}\bin\libtasn1-3.dll" - SetOutPath "$INSTDIR\modules" - File "c:\temp\m_ssl_gnutls.so" - File "c:\temp\m_sslinfo.so" - File "c:\temp\m_ssl_oper_cert.so" - SetOutPath "$INSTDIR\conf" - SetOverwrite off - File "key.pem" - File "cert.pem" -SectionEnd - -Section "Regexp Modules" SEC06 - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - File "..\bin\${BUILD}\bin\pcre.dll" - SetOutPath "$INSTDIR\modules" - File "c:\temp\m_filter_pcre.so" -SectionEnd - Section -AdditionalIcons SetOutPath $INSTDIR WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" @@ -209,8 +181,6 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Command modules" !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Default configuration files" !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Optional non-SSL modules" - !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "SSL modules and GnuTLS DLL libraries" - !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "Regular expression module and PCRE DLL library" !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -237,7 +207,6 @@ Section Uninstall Delete "$INSTDIR\uninst.exe" Delete "$INSTDIR\modules\*.so" Delete "$INSTDIR\conf\*.example" - Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.log" Delete "$INSTDIR\logs\*" Delete "$INSTDIR\data\*" diff --git a/win/inspircdVC90.vcproj b/win/inspircdVC90.vcproj index 53e00d7ce..df85a5f58 100644 --- a/win/inspircdVC90.vcproj +++ b/win/inspircdVC90.vcproj @@ -1,5441 +1,1941 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win/inspircdVC90.vcxproj b/win/inspircdVC90.vcxproj index 2b711e35f..d73446eba 100644 --- a/win/inspircdVC90.vcxproj +++ b/win/inspircdVC90.vcxproj @@ -1,1167 +1,395 @@ - - - - - Debug - Win32 - - - Debug - Win32 - - - Debug - x64 - - - Debug - x64 - - - Release - Win32 - - - Release - Win32 - - - Release - x64 - - - Release - x64 - - - - inspircd - {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8} - inspircd - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.20506.1 - ..\bin\debug\bin\ - DebugVc90\ - inspircd - .exe - false - ..\bin\release\bin\ - Release\ - inspircd - .exe - false - ..\bin\debug_x64\bin\ - x64DebugVc80\ - inspircd - .exe - false - ..\bin\release_x64\bin\ - x64ReleaseVc80\ - inspircd - .exe - false - - - - running configure... - "$(ProjectDir)\configure.exe" - - - Disabled - .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - ProgramDatabase - 4100; 4512; 4127;%(DisableSpecificWarnings) - true - - - psapi.lib;ws2_32.lib;mswsock.lib;kernel32.lib;user32.lib;%(AdditionalDependencies) - LinkVerbose - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)inspircd.pdb - Console - false - false - - - MachineX86 - - - @echo off -echo Compiling Command Modules... -cd ..\src\commands -nmake -f commands.mak -echo Compiling Modules... -cd ..\modules -nmake -f modules.mak - - - - - - running configure... - "$(ProjectDir)\configure.exe" - - - /MP %(AdditionalOptions) - MinSpace - true - .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - MultiThreadedDLL - - - Level3 - - - - - psapi.lib;ws2_32.lib;mswsock.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) - inspircd.ico;%(EmbedManagedResourceFile) - true - Console - true - true - UseLinkTimeCodeGeneration - false - - - MachineX86 - - - @echo off -echo Compiling Command Modules... -cd ..\src\commands -nmake -f commands.mak -echo Compiling Modules... -cd ..\modules -nmake -f modules.mak - - - - - - - - - - X64 - - - Disabled - .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - NotSet - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)inspircd.pdb - Console - false - false - - - MachineX64 - - - - - - - - - running configure... - $(ProjectDir)\configure.exe - - - - X64 - - - Disabled - .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreaded - - - Level3 - ProgramDatabase - - - ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - @echo off -echo Compiling Command Modules... -cd ..\src -nmake -f commands.mak -echo Compiling Modules... -cd modules -nmake -f modules.mak - - - - - - - - - - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {b922b569-727e-4eb0-827a-04e133a91de7} - - - - - + + + + + Debug + Win32 + + + Debug + Win32 + + + Debug + x64 + + + Debug + x64 + + + Release + Win32 + + + Release + Win32 + + + Release + x64 + + + Release + x64 + + + + inspircd + {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8} + inspircd + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + ..\bin\debug\ + DebugVc90\ + inspircd + .exe + false + ..\bin\release\ + Release\ + inspircd + .exe + false + ..\bin\debug_x64\bin\ + x64DebugVc80\ + inspircd + .exe + false + ..\bin\release_x64\bin\ + x64ReleaseVc80\ + inspircd + .exe + false + + + + running configure... + "$(ProjectDir)\configure.exe" + + + Disabled + .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + ProgramDatabase + 4100; 4512; 4127;%(DisableSpecificWarnings) + true + + + psapi.lib;ws2_32.lib;mswsock.lib;kernel32.lib;user32.lib;%(AdditionalDependencies) + LinkVerbose + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)inspircd.pdb + Console + false + false + + + MachineX86 + + + @echo off +echo Compiling Command Modules... +cd ..\src\commands +nmake -f commands.mak +echo Compiling Modules... +cd ..\modules +nmake -f modules.mak + + + + + + running configure... + "$(ProjectDir)\configure.exe" + + + /MP %(AdditionalOptions) + MinSpace + true + .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + MultiThreadedDLL + + + Level3 + + + + + psapi.lib;ws2_32.lib;mswsock.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + inspircd.ico;%(EmbedManagedResourceFile) + true + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + + + @echo off +echo Compiling Command Modules... +cd ..\src\commands +nmake -f commands.mak +echo Compiling Modules... +cd ..\modules +nmake -f modules.mak + + + + + + + + + + X64 + + + Disabled + .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + ws2_32.lib;mswsock.lib;%(AdditionalDependencies) + NotSet + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)inspircd.pdb + Console + false + false + + + MachineX64 + + + + + + + + + running configure... + $(ProjectDir)\configure.exe + + + + X64 + + + Disabled + .;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + + + Level3 + ProgramDatabase + + + ws2_32.lib;mswsock.lib;%(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + @echo off +echo Compiling Command Modules... +cd ..\src +nmake -f commands.mak +echo Compiling Modules... +cd modules +nmake -f modules.mak + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b922b569-727e-4eb0-827a-04e133a91de7} + + + + + \ No newline at end of file diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp index 4eeadfab1..6eb76e31a 100644 --- a/win/inspircd_memory_functions.cpp +++ b/win/inspircd_memory_functions.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2011 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index 3eb3202bc..8dcf7b757 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2011 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -718,27 +718,35 @@ int gettimeofday(timeval *tv, void *) return 0; } -/* World's largest hack to make m_spanningtree work */ +/* World's largest hack to make reference<> work */ #include "../src/modules/m_spanningtree/link.h" -static void unused_Function() +#include "../src/modules/ssl.h" +static void unused_function() { reference unused_Link; reference unused_Autoconnect; + reference unused_Cert; if (unused_Link) unused_Link->Port = -1; if (unused_Autoconnect) unused_Autoconnect->NextConnectTime = -1; + if (unused_Cert) + unused_Cert->dn = ""; Autoconnect *a = unused_Autoconnect; Link *l = unused_Link; + ssl_cert *s = unused_Cert; unused_Link = reference(unused_Link); unused_Autoconnect = reference(unused_Autoconnect); + unused_Cert = reference(unused_Cert); unused_Link = reference(l); unused_Autoconnect = reference(a); + unused_Cert = reference(s); delete unused_Link; delete unused_Autoconnect; + delete unused_Cert; } diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 36307ee00..4584a4356 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2011 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see diff --git a/win/m_spanningtreeVC90.vcxproj b/win/m_spanningtreeVC90.vcxproj index e7f3a55e3..d06f72cd9 100644 --- a/win/m_spanningtreeVC90.vcxproj +++ b/win/m_spanningtreeVC90.vcxproj @@ -1,289 +1,289 @@ - - - - - Debug - Win32 - - - Debug - Win32 - - - Debug - x64 - - - Debug - x64 - - - Release - Win32 - - - Release - Win32 - - - Release - x64 - - - Release - x64 - - - - m_spanningtree - {1EC86B60-AB2A-4984-8A7E-0422C15601E0} - m_spanningtree - Win32Proj - - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.20506.1 - ..\bin\debug\modules\ - Debug_spanningtree\ - m_spanningtree - .so - false - ..\bin\debug_x64\modules\ - x64Debug_spanningtree\ - m_spanningtree - .so - false - ..\bin\release\modules\ - Release\ - m_spanningtree - .so - false - ..\bin\release_x64\modules\ - x64Release_spanningtree\ - m_spanningtree - .so - false - - - - Disabled - ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - true - - - ws2_32.lib;inspircd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) - ..\bin\debug\bin;..\bin\debug\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)m_spanningtree.pdb - Windows - false - - - $(OutDir)m_spanningtree.lib - MachineX86 - - - - - X64 - - - Disabled - ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - - ws2_32.lib;inspircd.lib;%(AdditionalDependencies) - ..\bin\debug_x64\bin;..\bin\debug_x64\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)m_spanningtree.pdb - Windows - false - - - $(OutDir)m_spanningtree.lib - MachineX64 - - - - - /MP %(AdditionalOptions) - MinSpace - true - ..\include;..\win;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD;%(PreprocessorDefinitions) - false - MultiThreadedDLL - - - Level2 - ProgramDatabase - - - ws2_32.lib;inspircd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) - ..\bin\release\bin;..\bin\release\lib;%(AdditionalLibraryDirectories) - true - Windows - true - true - UseLinkTimeCodeGeneration - false - - - $(OutDir)m_spanningtree.lib - MachineX86 - - - Re-basing shared objects... - @cd $(ProjectDir) -@"$(ProjectDir)\rebase.bat" - - - - - - X64 - - - Disabled - ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD;%(PreprocessorDefinitions) - true - MultiThreaded - - - Level2 - ProgramDatabase - - - ws2_32.lib;inspircd.lib;%(AdditionalDependencies) - ..\bin\release_x64\bin;..\bin\release_x64\lib;%(AdditionalLibraryDirectories) - true - Windows - true - true - false - - - $(OutDir)m_spanningtree.lib - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)servers_spanningtree.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - {fe82a6fc-41c7-4cb1-aa46-6dbcb6c682c8} - - - - - + + + + + Debug + Win32 + + + Debug + Win32 + + + Debug + x64 + + + Debug + x64 + + + Release + Win32 + + + Release + Win32 + + + Release + x64 + + + Release + x64 + + + + m_spanningtree + {1EC86B60-AB2A-4984-8A7E-0422C15601E0} + m_spanningtree + Win32Proj + + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + ..\bin\debug\modules\ + Debug_spanningtree\ + m_spanningtree + .so + false + ..\bin\debug_x64\modules\ + x64Debug_spanningtree\ + m_spanningtree + .so + false + ..\bin\release\modules\ + Release\ + m_spanningtree + .so + false + ..\bin\release_x64\modules\ + x64Release_spanningtree\ + m_spanningtree + .so + false + + + + Disabled + ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + true + + + ws2_32.lib;inspircd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + ..\bin\debug\;%(AdditionalLibraryDirectories) + true + $(OutDir)m_spanningtree.pdb + Windows + false + + + $(OutDir)m_spanningtree.lib + MachineX86 + + + + + X64 + + + Disabled + ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + ws2_32.lib;inspircd.lib;%(AdditionalDependencies) + ..\bin\debug_x64\bin;..\bin\debug_x64\lib;%(AdditionalLibraryDirectories) + true + $(OutDir)m_spanningtree.pdb + Windows + false + + + $(OutDir)m_spanningtree.lib + MachineX64 + + + + + /MP %(AdditionalOptions) + MinSpace + true + ..\include;..\win;.;..\src\modules;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD;%(PreprocessorDefinitions) + false + MultiThreadedDLL + + + Level2 + ProgramDatabase + + + ws2_32.lib;inspircd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + ..\bin\release\;%(AdditionalLibraryDirectories) + true + Windows + true + true + UseLinkTimeCodeGeneration + false + + + $(OutDir)m_spanningtree.lib + MachineX86 + + + Re-basing shared objects... + @cd $(ProjectDir) +@"$(ProjectDir)\rebase.bat" + + + + + + X64 + + + Disabled + ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD;%(PreprocessorDefinitions) + true + MultiThreaded + + + Level2 + ProgramDatabase + + + ws2_32.lib;inspircd.lib;%(AdditionalDependencies) + ..\bin\release_x64\bin;..\bin\release_x64\lib;%(AdditionalLibraryDirectories) + true + Windows + true + true + false + + + $(OutDir)m_spanningtree.lib + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)servers_spanningtree.obj + + + + + + + + + + + + + + + + + + + + + + + + + + + {fe82a6fc-41c7-4cb1-aa46-6dbcb6c682c8} + + + + + \ No newline at end of file diff --git a/win/win32service.cpp b/win/win32service.cpp index 59a06b709..1ef27a4c7 100644 --- a/win/win32service.cpp +++ b/win/win32service.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2011 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see -- 2.39.2