From b817c337dc2c5d8efda710f445114aa9a9344611 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 18 Feb 2012 00:33:52 +0000 Subject: On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works. --- bin/lib32/ode.dll | Bin 0 -> 496640 bytes bin/ode.dll | Bin 496640 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 bin/lib32/ode.dll delete mode 100755 bin/ode.dll (limited to 'bin') diff --git a/bin/lib32/ode.dll b/bin/lib32/ode.dll new file mode 100755 index 0000000..f310358 Binary files /dev/null and b/bin/lib32/ode.dll differ diff --git a/bin/ode.dll b/bin/ode.dll deleted file mode 100755 index f310358..0000000 Binary files a/bin/ode.dll and /dev/null differ -- cgit v1.1 From 0ef64fbe03a0872c9ae55d615b85fb9a24bbc820 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 18 Feb 2012 02:46:07 +0000 Subject: Actually add the Windows 64-bit ode.dll file. This might be why it didn't work. --- bin/lib64/ode.dll | Bin 0 -> 656384 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 bin/lib64/ode.dll (limited to 'bin') diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll new file mode 100755 index 0000000..df3a6c4 Binary files /dev/null and b/bin/lib64/ode.dll differ -- cgit v1.1