Prepare version 2.83.7.1.

AndresTraks · Aug 21, 2016 · fde6fc7 · fde6fc7
1 parent 5f6be8d
commit fde6fc7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/BulletSharp.vcxproj b/BulletSharp.vcxproj
@@ -1056,7 +1056,7 @@
  <WarningLevel>Level1</WarningLevel>
  </ClCompile>
  <Link>
- <AdditionalDependencies>LinearMath_Release.lib;BulletCollision_Release.lib;BulletDynamics_Release.lib</AdditionalDependencies>
+ <AdditionalDependencies>LinearMath.lib;BulletCollision.lib;BulletDynamics.lib</AdditionalDependencies>
  <AdditionalLibraryDirectories>..\bullet3\msvc\2015\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  </ItemDefinitionGroup>
@@ -1093,7 +1093,7 @@
  <WarningLevel>Level1</WarningLevel>
  </ClCompile>
  <Link>
- <AdditionalDependencies>LinearMath_Release.lib;BulletCollision_Release.lib;BulletDynamics_Release.lib</AdditionalDependencies>
+ <AdditionalDependencies>LinearMath.lib;BulletCollision.lib;BulletDynamics.lib</AdditionalDependencies>
  <AdditionalLibraryDirectories>..\bullet3\msvc\2015\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  </ItemDefinitionGroup>
@@ -1128,7 +1128,7 @@
  <WarningLevel>Level1</WarningLevel>
  </ClCompile>
  <Link>
- <AdditionalDependencies>LinearMath_Release.lib;BulletCollision_Release.lib;BulletDynamics_Release.lib</AdditionalDependencies>
+ <AdditionalDependencies>LinearMath.lib;BulletCollision.lib;BulletDynamics.lib</AdditionalDependencies>
  <AdditionalLibraryDirectories>..\bullet3\msvc\2015\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  </ItemDefinitionGroup>
@@ -1163,7 +1163,7 @@
  <WarningLevel>Level1</WarningLevel>
  </ClCompile>
  <Link>
- <AdditionalDependencies>LinearMath_Release.lib;BulletCollision_Release.lib;BulletDynamics_Release.lib</AdditionalDependencies>
+ <AdditionalDependencies>LinearMath.lib;BulletCollision.lib;BulletDynamics.lib</AdditionalDependencies>
  <AdditionalLibraryDirectories>..\bullet3\msvc\2015\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  </ItemDefinitionGroup>
@@ -1198,7 +1198,7 @@
  <WarningLevel>Level1</WarningLevel>
  </ClCompile>
  <Link>
- <AdditionalDependencies>LinearMath_Release.lib;BulletCollision_Release.lib;BulletDynamics_Release.lib</AdditionalDependencies>
+ <AdditionalDependencies>LinearMath.lib;BulletCollision.lib;BulletDynamics.lib</AdditionalDependencies>
  <AdditionalLibraryDirectories>..\bullet3\msvc\2015\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  </ItemDefinitionGroup>
@@ -1233,7 +1233,7 @@
  <WarningLevel>Level1</WarningLevel>
  </ClCompile>
  <Link>
- <AdditionalDependencies>LinearMath_Release.lib;BulletCollision_Release.lib;BulletDynamics_Release.lib</AdditionalDependencies>
+ <AdditionalDependencies>LinearMath.lib;BulletCollision.lib;BulletDynamics.lib</AdditionalDependencies>
  <AdditionalLibraryDirectories>..\bullet3\msvc\2015\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  </ItemDefinitionGroup>

diff --git a/demos/zip.bat b/demos/zip.bat
@@ -48,6 +48,7 @@ copy Generic\bin\Release\data\file.obj bin\data\
 copy Generic\bin\Release\data\cube.ele bin\data\
 copy Generic\bin\Release\data\cube.node bin\data\
 copy Generic\bin\Release\data\bullet_basic.xml bin\data\
+copy Generic\bin\Release\file_convex.obj bin\
 copy Generic\bin\Release\testFile.bullet bin\
 rem copy Generic\bin\Release\data\heightfield128x128.raw bin\data\
 
@@ -58,17 +59,20 @@ copy Generic\bin\Release\DemoFramework.SharpDX11.dll bin\
 copy Generic\bin\Release\DemoFramework.SlimDX.dll bin\
 copy Generic\bin\Release\DemoFramework.MonoGame.dll bin\
 
+copy Generic\bin\Release\NAudio.dll bin\
 copy Generic\bin\Release\OpenTK.dll bin\
 copy Generic\bin\Release\OpenTK.GLControl.dll bin\
 copy Generic\bin\Release\SharpDX.dll bin\
 copy Generic\bin\Release\SharpDX.D3DCompiler.dll bin\
+copy Generic\bin\Release\SharpDX.Desktop.dll bin\
 copy Generic\bin\Release\SharpDX.Direct2D1.dll bin\
 copy Generic\bin\Release\SharpDX.Direct3D10.dll bin\
 copy Generic\bin\Release\SharpDX.Direct3D11.dll bin\
 copy Generic\bin\Release\SharpDX.Direct3D11.Effects.dll bin\
 copy Generic\bin\Release\SharpDX.DXGI.dll bin\
-copy Generic\bin\Release\sharpdx_direct3d11_effects_x64.dll bin\
-copy Generic\bin\Release\sharpdx_direct3d11_effects_x86.dll bin\
+copy Generic\bin\Release\SharpDX.Mathematics.dll bin\
+copy Generic\bin\Release\sharpdx_direct3d11_1_effects_x64.dll bin\
+copy Generic\bin\Release\sharpdx_direct3d11_1_effects_x86.dll bin\
 
 cmd /C git clone https://github.com/AndresTraks/BulletSharp.git repo
 move repo\demos\Generic src

diff --git a/src/Resources.rc b/src/Resources.rc
@@ -45,8 +45,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION BULLETSHARP_VERSION_MAJOR,BULLETSHARP_VERSION_MINOR,BULLETSHARP_VERSION_REVISION,0
- PRODUCTVERSION BULLETSHARP_VERSION_MAJOR,BULLETSHARP_VERSION_MINOR,BULLETSHARP_VERSION_REVISION,0
+ FILEVERSION BULLETSHARP_VERSION_MAJOR,BULLETSHARP_VERSION_MINOR,BULLETSHARP_VERSION_REVISION,BULLETSHARP_VERSION_REVISION2
+ PRODUCTVERSION BULLETSHARP_VERSION_MAJOR,BULLETSHARP_VERSION_MINOR,BULLETSHARP_VERSION_REVISION,BULLETSHARP_VERSION_REVISION2
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L

diff --git a/src/Version.h b/src/Version.h
@@ -1,5 +1,6 @@
 #define BULLETSHARP_VERSION_MAJOR 2
 #define BULLETSHARP_VERSION_MINOR 83
 #define BULLETSHARP_VERSION_REVISION 7
-#define BULLETSHARP_VERSION_STRING "2.83.7"
+#define BULLETSHARP_VERSION_REVISION2 1
+#define BULLETSHARP_VERSION_STRING "2.83.7.1"
 #define BULLETSHARP_COPYRIGHT "Copyright (C) Andres Traks 2009-2016"
diff --git a/zip.bat b/zip.bat
@@ -1,2 +1,4 @@
-"%PROGRAMFILES%\7-Zip\7z.exe" a bulletsharp.7z "Release SlimDX\bulletsharp.dll" "Release Generic\bulletsharp.dll" "Release OpenTK\bulletsharp.dll" "Release SharpDX\bulletsharp.dll" "Release SharpDX Signed\bulletsharp.dll" "Release Mogre\bulletsharp.dll" "Release MonoGame\bulletsharp.dll"
-"%PROGRAMFILES%\7-Zip\7z.exe" a bulletsharp.zip "Release SlimDX\bulletsharp.dll" "Release Generic\bulletsharp.dll" "Release OpenTK\bulletsharp.dll" "Release SharpDX\bulletsharp.dll" "Release SharpDX Signed\bulletsharp.dll" "Release Mogre\bulletsharp.dll" "Release MonoGame\bulletsharp.dll"
+set FILES="Release SlimDX\bulletsharp.dll" "Release Generic\bulletsharp.dll" "Release Numerics\bulletsharp.dll" "Release OpenTK\bulletsharp.dll" "Release SharpDX\bulletsharp.dll" "Release Mogre\bulletsharp.dll" "Release MonoGame\bulletsharp.dll"
+
+"%PROGRAMFILES%\7-Zip\7z.exe" a bulletsharp.7z %FILES%
+"%PROGRAMFILES%\7-Zip\7z.exe" a bulletsharp.zip %FILES%