From 006ad9e3c96fa4c692bb494c9aa421efa464ad26 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 20 Apr 2010 19:07:39 +0000
Subject: projectm 2.0 is supported

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2254 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/projectM/cwrapper/projectM-cwrapper.h      |  3 ++-
 src/lib/projectM/cwrapper/projectM-cwrapper.sln    |  4 ++--
 src/lib/projectM/cwrapper/projectM-cwrapper.vcproj | 27 ++++++++++------------
 3 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/lib/projectM/cwrapper/projectM-cwrapper.h b/src/lib/projectM/cwrapper/projectM-cwrapper.h
index 43f36ef4..125b1253 100644
--- a/src/lib/projectM/cwrapper/projectM-cwrapper.h
+++ b/src/lib/projectM/cwrapper/projectM-cwrapper.h
@@ -7,10 +7,11 @@
 #define PROJECTM_VERSION_1_00_00 1000000 // 1.00.00 = 1.0 or 1.01 (same version number for 1.0 and 1.01)
 #define PROJECTM_VERSION_1_10_00 1010000 // 1.10.00 = 1.1 (bigger than 1.2 due to strange versioning)
 #define PROJECTM_VERSION_1_02_00 1002000 // 1.02.00 = 1.2
+#define PROJECTM_VERSION_2_00_00 2000000 // 2.00.00 = 2.0
 
 // version of projectM to wrap (see PROJECTM_VERSION)
 #ifndef PROJECTM_VERSION_INT
-#define PROJECTM_VERSION_INT PROJECTM_VERSION_1_02_00
+#define PROJECTM_VERSION_INT PROJECTM_VERSION_2_00_00
 #endif
 
 extern "C" {
diff --git a/src/lib/projectM/cwrapper/projectM-cwrapper.sln b/src/lib/projectM/cwrapper/projectM-cwrapper.sln
index e05f79a3..61fef817 100644
--- a/src/lib/projectM/cwrapper/projectM-cwrapper.sln
+++ b/src/lib/projectM/cwrapper/projectM-cwrapper.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projectM-cwrapper", "projectM-cwrapper.vcproj", "{8E653284-12F3-4A90-9D0D-4195557051F7}"
 EndProject
 Global
diff --git a/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj b/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj
index 94e848d7..6f6ef4c1 100644
--- a/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj
+++ b/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="projectM-cwrapper"
 	ProjectGUID="{8E653284-12F3-4A90-9D0D-4195557051F7}"
 	RootNamespace="projectMcwrapper"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -40,14 +41,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM&quot;;&quot;D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include&quot;"
+				AdditionalIncludeDirectories="&quot;D:\daten\projectM-2.0.1-Source&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROJECTMCWRAPPER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -61,11 +61,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libprojectM.lib"
+				AdditionalDependencies="projectM.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM\Debug&quot;"
+				AdditionalLibraryDirectories="&quot;D:\daten\projectM-2.0.1-Source\build\Debug&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -86,9 +88,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -118,13 +117,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM&quot;;&quot;D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include&quot;"
+				AdditionalIncludeDirectories="&quot;D:\daten\projectM-2.0.1-Source&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROJECTMCWRAPPER_EXPORTS"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -138,13 +136,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libprojectM.lib"
+				AdditionalDependencies="projectM.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM\Release&quot;"
+				AdditionalLibraryDirectories="&quot;D:\daten\projectM-2.0.1-Source\build\Release&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -165,9 +165,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-- 
cgit v1.2.3