From a8374dc0b19440ce5d1dcdda954421a4d942c451 Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Sat, 22 Oct 2005 23:55:21 +0000
Subject: fix compilation for CFM small fixes release version small change
 proposed by Tim Blechmann

svn path=/trunk/; revision=3753
---
 externals/grill/xsample/source/groove.cpp |   7 ++++---
 externals/grill/xsample/source/main.h     |   2 +-
 externals/grill/xsample/xsample.mcp       | Bin 457399 -> 456081 bytes
 externals/grill/xsample/xsample.vcproj    |   7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'externals')

diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp
index a5e3aaf0..d76e3776 100644
--- a/externals/grill/xsample/source/groove.cpp
+++ b/externals/grill/xsample/source/groove.cpp
@@ -94,9 +94,10 @@ protected:
 
 	inline void setposmod(double pos)
 	{
-		double p = pos-znsmin;
-		if(p >= 0) curpos = znsmin+fmod(p,znsmax-znsmin);
-		else curpos = znsmax+fmod(p,znsmax-znsmin);
+        if(pos >= 0) 
+            curpos = znsmin+fmod(pos,znsmax-znsmin);
+        else 
+            curpos = znsmax+fmod(pos,znsmax-znsmin);
 	}
 
     virtual void DoReset();
diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h
index c3a1a66e..6fb1bd2c 100644
--- a/externals/grill/xsample/source/main.h
+++ b/externals/grill/xsample/source/main.h
@@ -15,7 +15,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #error You need at least flext version 0.5.0
 #endif
 
-#define XSAMPLE_VERSION "0.3.1pre8"
+#define XSAMPLE_VERSION "0.3.1"
 
 extern "C++" {
 
diff --git a/externals/grill/xsample/xsample.mcp b/externals/grill/xsample/xsample.mcp
index ae5530a9..5fbc3068 100755
Binary files a/externals/grill/xsample/xsample.mcp and b/externals/grill/xsample/xsample.mcp differ
diff --git a/externals/grill/xsample/xsample.vcproj b/externals/grill/xsample/xsample.vcproj
index c3d5de2c..036de43c 100644
--- a/externals/grill/xsample/xsample.vcproj
+++ b/externals/grill/xsample/xsample.vcproj
@@ -89,10 +89,11 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="c:\programme\audio\pd\src;..\flext\source"
+				AdditionalIncludeDirectories="c:\data\pd\pd-cvs\src;..\flext\source"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="5"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="prefix.h"
 				BrowseInformation="1"
@@ -108,7 +109,7 @@
 				OutputFile="$(outdir)/xsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="c:\programme\audio\pd\bin\"
+				AdditionalLibraryDirectories="c:\data\pd\pd-cvs\bin\"
 				GenerateDebugInformation="TRUE"
 				ImportLibrary=".\pd-msvc\d/xsample.lib"
 				TargetMachine="1"/>
-- 
cgit v1.2.1