From 64dd3c6655b6044d06bed018912173b6f6d287fb Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 27 Oct 2012 06:44:37 -0400 Subject: Update Windows install script for VS 2012, update Windows README, and fixed VS 2012 build --- docs/WIN32.txt | 26 +++++----------------- install.js | 53 ++++++++++++++++++++++++--------------------- src/core/Makefile.win32 | 2 +- src/protocol/Makefile.win32 | 2 +- 4 files changed, 35 insertions(+), 48 deletions(-) diff --git a/docs/WIN32.txt b/docs/WIN32.txt index 22f4a562d..0f1d0b133 100644 --- a/docs/WIN32.txt +++ b/docs/WIN32.txt @@ -20,36 +20,20 @@ Anope for Windows * Current Anope source: http://sourceforge.net/project/showfiles.php?group_id=94081 - If you have Visual C++ 6, 7 (.NET 2002/2003), 8 (2005) or 10 (2010) skip ahead to step 2, else you + If you have Visual C++ 2008, 2010, or 2012 skip ahead to step 2, else you need to download the following free components from Microsoft. Once downloaded, install one of the following, for best results use MS VC 2010. * Microsoft Visual C++ 2010 Express - http://www.microsoft.com/express/vc/ + http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express or * Microsoft Visual C++ 2008 Express Edition: - http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express + http://www.microsoft.com/en-us/download/details.aspx?id=14597 - or - - * Microsoft Visual C++ 2005 Express Edition: - http://msdn.microsoft.com/vstudio/express/visualc/download/ - - if you installed Visual C++ 2010, it comes included with an SDK, so skip ahead to step 2, otherwise - install the following PlatformSDK: - - * Microsoft Windows PlatformSDK: (Requires WGA validation) - http://www.microsoft.com/downloads/details.aspx?FamilyId=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en - - (NOTE: Although this says for Windows Server 2003, it does infact work on all supported - versions of Windows.) - - When installing, you should select the Custom option, and ensure that the top option relating to - the registering of environment variables, is enabled in addition to the default selections. - - If you do not do this, you may run into problems with the PSDK not being found properly during install. + * Microsoft Windows Platform SDK: (Requires WGA validation) + http://www.microsoft.com/en-us/download/details.aspx?id=3138 * MySQL for Windows (only needed if building with MySQL enabled): http://dev.mysql.com/ diff --git a/install.js b/install.js index 55918d62b..8000df244 100644 --- a/install.js +++ b/install.js @@ -70,6 +70,27 @@ var installerQuestions = [ ]; var buildPackages = [ + { + 'name' : 'Microsoft Visual Studio 2012', + 'libpaths' : [ + 'Program Files\\Microsoft Visual Studio 11.0\\VC\\lib', + 'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\lib', + 'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib', + 'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0\\Lib', + ], + 'incpaths': [ + 'Program Files\\Microsoft Visual Studio 11.0\\VC\\include', + 'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\include', + 'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Include', + 'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0\\Include', + ], + 'nmake' : [ + 'Program Files\\Microsoft Visual Studio 11.0\\VC\\bin', + 'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\bin', + ], + 'additional_switches' : [ '/w' ], + 'installedDrive' : 'C' + }, { 'name' : 'Microsoft Visual Studio 2010 (64bit)', 'libpaths' : [ @@ -77,7 +98,7 @@ var buildPackages = [ 'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib', 'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib', 'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Lib' - ], + ], 'incpaths': [ 'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\include', 'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Include', @@ -87,8 +108,8 @@ var buildPackages = [ 'nmake' : [ 'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\bin', ], - 'additional_switches' : [ '/w' ], - 'installedDrive' : 'C' + 'additional_switches' : [ '/w' ], + 'installedDrive' : 'C' }, { 'name' : 'Microsoft Visual Studio 2010', @@ -159,8 +180,8 @@ var buildPackages = [ ], 'additional_switches' : [ '/w' - ], - 'installedDrive' : 'C' + ], + 'installedDrive' : 'C' }, { 'name' : 'Microsoft Visual Studio 2005 (Old PSDK)', @@ -178,26 +199,8 @@ var buildPackages = [ ], 'additional_switches' : [ '/w' - ], - 'installedDrive' : 'C' - }, - - { - 'name' : 'Microsoft Visual Studio .NET 2003', - 'libpaths' : [ - 'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Lib', - 'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Lib' - ], - 'incpaths' : [ - 'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Include', - 'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Include' - ], - 'nmake' : [ - 'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Bin', - '' - ], - 'additional_switches' : false, - 'installedDrive' : 'C' + ], + 'installedDrive' : 'C' } ]; diff --git a/src/core/Makefile.win32 b/src/core/Makefile.win32 index 1c05bb42b..536018fd0 100644 --- a/src/core/Makefile.win32 +++ b/src/core/Makefile.win32 @@ -3,7 +3,7 @@ include ../../Makefile.inc.win32 SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fantasy_kick.c bs_fantasy_kickban.c bs_fantasy_owner.c bs_fantasy_seen.c bs_help.c bs_info.c bs_kick.c bs_say.c bs_set.c bs_unassign.c cs_access.c cs_akick.c cs_ban.c cs_clear.c cs_drop.c cs_forbid.c cs_getkey.c cs_getpass.c cs_help.c cs_identify.c cs_info.c cs_invite.c cs_kick.c cs_list.c cs_logout.c cs_modes.c cs_register.c cs_sendpass.c cs_set.c cs_status.c cs_suspend.c cs_topic.c cs_xop.c enc_none.c enc_md5.c enc_old.c enc_sha1.c he_help.c hs_del.c hs_delall.c hs_group.c hs_help.c hs_list.c hs_off.c hs_on.c hs_set.c hs_setall.c ms_cancel.c ms_check.c ms_del.c ms_help.c ms_info.c ms_list.c ms_read.c ms_rsend.c ms_send.c ms_sendall.c ms_set.c ms_staff.c ns_access.c ns_alist.c ns_drop.c ns_forbid.c ns_getemail.c ns_getpass.c ns_ghost.c ns_group.c ns_help.c ns_identify.c ns_info.c ns_list.c ns_logout.c ns_recover.c ns_register.c ns_release.c ns_sendpass.c ns_set.c ns_saset.c ns_status.c ns_suspend.c ns_update.c os_admin.c os_akill.c os_chankill.c os_chanlist.c os_clearmodes.c os_defcon.c os_global.c os_help.c os_ignore.c os_jupe.c os_kick.c os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c OBJECTS= $(SRCS:.c=.dll) CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include" -LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:$(VERSION) +LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:1.8 all: $(OBJECTS) diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32 index ae74cbe08..e59278d52 100644 --- a/src/protocol/Makefile.win32 +++ b/src/protocol/Makefile.win32 @@ -5,7 +5,7 @@ SRCS=bahamut.c charybdis.c dreamforge.c hybrid.c inspircd11.c inspircd12.c inspi OBJECTS= $(SRCS:.c=.dll) CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include" -LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /VERSION:$(VERSION) +LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /VERSION:1.8 all: $(OBJECTS) -- cgit