1--- Csound5.10.1/SConstruct.orig	2008-12-18 18:26:46.000000000 +0000
2+++ Csound5.10.1/SConstruct	2009-03-30 20:08:10.000000000 +0100
3@@ -768,9 +768,7 @@
4 # library version is CS_VERSION.CS_APIVERSION
5 csoundLibraryVersion = '5.2'
6 csoundLibraryName = 'csound'
7-if commonEnvironment['useDouble'] != '0':
8-    csoundLibraryName += '64'
9-elif getPlatform() == 'win32':
10+if getPlatform() == 'win32':
11     csoundLibraryName += '32'
12 # flags for linking with the Csound library
13 libCsoundLinkFlags = []
14@@ -814,8 +812,6 @@
15             tmp = '%s/lib/csound/plugins' % commonEnvironment['prefix']
16         else:
17             tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix']
18-        if commonEnvironment['useDouble'] != '0':
19-            tmp += '64'
20         s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
21         csoundLibraryEnvironment.Append(CPPFLAGS = [s])
22     elif buildOSXFramework != 0:
23@@ -2588,10 +2584,7 @@
24     if i[:sys.prefix.__len__()] == sys.prefix and i[-13:] == 'site-packages':
25         PYTHON_DIR = i
26
27-if commonEnvironment['useDouble'] == '0':
28-    PLUGIN_DIR = LIB_DIR + "/csound/plugins"
29-else:
30-    PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
31+PLUGIN_DIR = LIB_DIR + "/csound/plugins"
32
33 if commonEnvironment['install'] == '1':
34     installExecutables = Alias('install-executables',
35--- Csound5.10.1/Top/csmodule.c.orig	2008-12-18 17:37:02.000000000 +0000
36+++ Csound5.10.1/Top/csmodule.c	2009-03-30 20:08:10.000000000 +0100
37@@ -638,17 +638,12 @@
38       return CSOUND_ERROR;
39
40     /* open plugin directory */
41-    dname = csoundGetEnv(csound, (sizeof(MYFLT) == sizeof(float) ?
42-                                  plugindir_envvar : plugindir64_envvar));
43+    dname = csoundGetEnv(csound, plugindir_envvar);
44     if (dname == NULL) {
45 #if ENABLE_OPCODEDIR_WARNINGS
46       csound->opcodedirWasOK = 0;
47-#  ifdef USE_DOUBLE
48-      dname = csoundGetEnv(csound, plugindir_envvar);
49-      if (dname == NULL)
50-#  endif
51 #endif
52-        dname = CS_DEFAULT_PLUGINDIR;
53+      dname = CS_DEFAULT_PLUGINDIR;
54     }
55     dir = opendir(dname);
56     if (UNLIKELY(dir == (DIR*) NULL)) {
57--- Csound5.13.0/Top/csmodule.c.orig	2011-04-07 10:48:47.631735127 +0100
58+++ Csound5.13.0/Top/csmodule.c	2011-04-07 10:49:19.170735598 +0100
59@@ -127,7 +127,6 @@
60
61 /* environment variable storing path to plugin libraries */
62 static  const   char    *plugindir_envvar =   "OPCODEDIR";
63-static  const   char    *plugindir64_envvar = "OPCODEDIR64";
64
65 /* default directory to load plugins from if environment variable is not set */
66 #if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
67