Updated projects to include /MP, and some changes to Athenasub.

Originally committed to SVN as r2292.

aegilib/aegilib_2008.vcproj

@@ -40,6 +40,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="include/aegilib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
@@ -109,6 +110,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
@@ -183,6 +185,10 @@
 				RelativePath=".\include\aegilib\fastbuffer.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\aegilib\range.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\aegilib\selection.h"
 				>

aegilib/include/aegilib/range.h

@@ -0,0 +1,58 @@
+// Copyright (c) 2008, Rodrigo Braz Monteiro
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   * Redistributions of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//   * Neither the name of the Aegisub Group nor the names of its contributors
+//     may be used to endorse or promote products derived from this software
+//     without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// -----------------------------------------------------------------------------
+//
+// AEGISUB/ATHENASUB
+//
+// Website: http://www.aegisub.net
+// Contact: mailto:amz@aegisub.net
+//
+
+#pragma once
+#include "exception.h"
+
+namespace Athenasub {
+
+	// Range class
+	class Range {
+	private:
+		size_t start,end;
+
+	public:
+		Range() : start(0), end(0) {}
+		Range(size_t _start,size_t _end) : start(_start), end(_end) {}
+
+		size_t GetLine(size_t n) const {
+			if (start+n < end) return start+n;
+			else THROW_ATHENA_EXCEPTION(Exception::Out_Of_Range);
+		}
+		size_t GetSize() const { return end-start; }
+		size_t GetStart() const { return start; }
+		size_t GetEnd() const { return end; }
+	};
+}

aegilib/include/aegilib/selection.h

@@ -35,25 +35,10 @@
 
 #pragma once
 #include <vector>
-#include "api.h"
+#include "range.h"
 
 namespace Athenasub {
 
-	// Range class
-	class Range {
-	private:
-		size_t start,end;
-
-	public:
-		Range() : start(0), end(0) {}
-		Range(size_t _start,size_t _end) : start(_start), end(_end) {}
-
-		size_t GetLine(size_t n) const;
-		size_t GetSize() const { return end-start; }
-		size_t GetStart() const { return start; }
-		size_t GetEnd() const { return end; }
-	};
-
 	// Selection class
 	class Selection {
 	private:

aegilib/src/selection.cpp

@@ -152,12 +152,3 @@ void Selection::RemoveSelection (const Selection &param)
 {
 	(void) param;
 }
-
-
-/////////////////////
-// Get line in range
-size_t Range::GetLine(size_t n) const
-{
-	if (start+n < end) return start+n;
-	else THROW_ATHENA_EXCEPTION(Exception::Out_Of_Range);
-}

aegilib/test/test_2008.vcproj

@@ -139,11 +139,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="0"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"

build/aegisub_vs2008/aegisub_vs2008.vcproj

@@ -44,6 +44,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../aegisub/win32;../../hunspell/src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
@@ -216,6 +217,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="../../aegisub/win32;../../hunspell/src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"