diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure.cpp | 4 | ||||
| -rw-r--r-- | win/inspircd.nsi | 4 | ||||
| -rw-r--r-- | win/inspircd_win32wrapper.cpp | 45 |
3 files changed, 12 insertions, 41 deletions
diff --git a/win/configure.cpp b/win/configure.cpp index e7ae75691..3a2e684ef 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -301,6 +301,7 @@ void Run() string base_path = get_string_option("In what directory do you wish to install the InspIRCd base?", ".."); string config_path = get_string_option("In what directory are the configuration files?", "conf"); string mod_path = get_string_option("In what directory are the modules to be compiled to?", "modules"); + string data_path = get_string_option("In what directory is the variable data to be placed in?", "data"); string 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); @@ -311,6 +312,7 @@ void Run() 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_path.c_str()); printf_c("\033[0mModule path:\033[1;32m %s\n", mod_path.c_str()); + printf_c("\033[0mData path:\033[1;32m %s\n", data_path.c_str()); printf_c("\033[0mSocket Engine:\033[1;32m %s\n", "select"); printf("\n"); sc(TNORMAL); @@ -322,6 +324,7 @@ void Run() printf("\n"); // escape the pathes + escape_string(data_path); escape_string(config_path); escape_string(mod_path); @@ -333,6 +336,7 @@ void Run() 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 SOMAXCONN_S \"128\"\n"); fprintf(f, "#define MAXBUF 514\n"); diff --git a/win/inspircd.nsi b/win/inspircd.nsi index 1fa21c6f9..4204ec29b 100644 --- a/win/inspircd.nsi +++ b/win/inspircd.nsi @@ -226,6 +226,8 @@ Section Uninstall Delete "$INSTDIR\conf\*.example" Delete "$INSTDIR\conf\aliases\*.example" Delete "$INSTDIR\conf\modules\*.example" + Delete "$INSTDIR\conf\modules\modules.conf.charybdis" + Delete "$INSTDIR\conf\modules\modules.conf.unreal" Delete "$INSTDIR\*.log" Delete "$INSTDIR\logs\*" Delete "$INSTDIR\data\*" @@ -238,6 +240,8 @@ Section Uninstall RMDir "$SMPROGRAMS\InspIRCd" RMDir "$INSTDIR\modules" + RMDir "$INSTDIR\conf\aliases" + RMDir "$INSTDIR\conf\modules" RMDir "$INSTDIR\conf" RMDir "$INSTDIR\logs" RMDir "$INSTDIR\data" diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index 7ef56e524..bdd60d1cc 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -668,44 +668,7 @@ int gettimeofday(timeval *tv, void *) /* World's largest hack to make reference<> work */ #include "../src/modules/m_spanningtree/link.h" #include "../src/modules/ssl.h" -static void unused_function() -{ - reference<Link> unused_Link; - reference<Autoconnect> unused_Autoconnect; - reference<ssl_cert> unused_Cert; - reference<OperInfo> unused_OperInfo; - - if (unused_Link) - unused_Link->Port = -1; - if (unused_Autoconnect) - unused_Autoconnect->NextConnectTime = -1; - if (unused_Cert) - unused_Cert->dn = ""; - if (unused_OperInfo) - unused_OperInfo->name = ""; - - Autoconnect *a = unused_Autoconnect; - Link *l = unused_Link; - ssl_cert *s = unused_Cert; - OperInfo *o = unused_OperInfo; - - unused_Link = reference<Link>(unused_Link); - unused_Autoconnect = reference<Autoconnect>(unused_Autoconnect); - unused_Cert = reference<ssl_cert>(unused_Cert); - unused_OperInfo = reference<OperInfo>(unused_OperInfo); - - unused_Link = reference<Link>(l); - unused_Autoconnect = reference<Autoconnect>(a); - unused_Cert = reference<ssl_cert>(s); - unused_OperInfo = reference<OperInfo>(o); - - unused_Link = l; - unused_Autoconnect = a; - unused_Cert = s; - unused_OperInfo = o; - - delete unused_Link; - delete unused_Autoconnect; - delete unused_Cert; - delete unused_OperInfo; -} +template class reference<Link>; +template class reference<Autoconnect>; +template class reference<ssl_cert>; +template class reference<OperInfo>; |