Merge in burlex's easy-build patch, apparently its now single-click and wait.

Will play with this tomorrow.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7060 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/win/inspircdVC80.sln b/win/inspircdVC80.sln
index 35e445473f6ad5ced0e4720b08ca940b60fcdc95..b1287bece02b6349ecef2e09b991e18dec8ddde3 100644 (file)
--- a/win/inspircdVC80.sln
+++ b/win/inspircdVC80.sln
@@ -15,35 +15,21 @@ EndProject
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
-               Debug-Auto|Win32 = Debug-Auto|Win32\r
                Release|Win32 = Release|Win32\r
-               Release-Auto|Win32 = Release-Auto|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Debug|Win32.Build.0 = Debug|Win32\r
-               {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Debug-Auto|Win32.ActiveCfg = Debug-Auto|Win32\r
-               {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Debug-Auto|Win32.Build.0 = Debug-Auto|Win32\r
                {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Release|Win32.ActiveCfg = Release|Win32\r
                {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Release|Win32.Build.0 = Release|Win32\r
-               {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Release-Auto|Win32.ActiveCfg = Release-Auto|Win32\r
-               {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}.Release-Auto|Win32.Build.0 = Release-Auto|Win32\r
                {B922B569-727E-4EB0-827A-04E133A91DE7}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {B922B569-727E-4EB0-827A-04E133A91DE7}.Debug|Win32.Build.0 = Debug|Win32\r
-               {B922B569-727E-4EB0-827A-04E133A91DE7}.Debug-Auto|Win32.ActiveCfg = Debug-Auto|Win32\r
-               {B922B569-727E-4EB0-827A-04E133A91DE7}.Debug-Auto|Win32.Build.0 = Debug-Auto|Win32\r
                {B922B569-727E-4EB0-827A-04E133A91DE7}.Release|Win32.ActiveCfg = Release|Win32\r
                {B922B569-727E-4EB0-827A-04E133A91DE7}.Release|Win32.Build.0 = Release|Win32\r
-               {B922B569-727E-4EB0-827A-04E133A91DE7}.Release-Auto|Win32.ActiveCfg = Release-Auto|Win32\r
-               {B922B569-727E-4EB0-827A-04E133A91DE7}.Release-Auto|Win32.Build.0 = Release-Auto|Win32\r
                {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Debug|Win32.Build.0 = Debug|Win32\r
-               {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Debug-Auto|Win32.ActiveCfg = Debug-Auto|Win32\r
-               {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Debug-Auto|Win32.Build.0 = Debug-Auto|Win32\r
                {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Release|Win32.ActiveCfg = Release|Win32\r
                {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Release|Win32.Build.0 = Release|Win32\r
-               {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Release-Auto|Win32.ActiveCfg = Release-Auto|Win32\r
-               {1EC86B60-AB2A-4984-8A7E-0422C15601E0}.Release-Auto|Win32.Build.0 = Release-Auto|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 6178aae235285712f3d933cffa310f6187fc921f..4bfbfb9a97c426c2f60aaffc5780d6a837f16ca5 100644 (file)
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -25,6 +25,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="running configure..."\r
+                               CommandLine="$(InputDir)\configure.exe"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -96,6 +98,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -108,6 +111,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="running configure..."\r
+                               CommandLine="$(InputDir)\configure.exe&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -174,6 +179,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
                <Configuration\r

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index a28b5d6d7f1e901a0bc61fea67266d89f08fcb77..fc7c9f7dfa9f160eb3a63487baff09dc2d6d04fe 100644 (file)
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -40,6 +40,7 @@
 \r
 /* Disable the deprecation warnings.. it spams :P */\r
 #define _CRT_SECURE_NO_DEPRECATE\r
+#define _SCL_SECURE_NO_DEPRECATE\r
 \r
 /* Say we're building on windows 2000. Anyone running something older than this\r
  * reeeeeeeally needs to upgrade! */\r