Skip to content

Commit

Permalink
Add MinSizeRel configuration.
Browse files Browse the repository at this point in the history 
Remove VS2010 solution.
  • Loading branch information
@AndresTraks
AndresTraks committed Aug 21, 2016
1 parent 475b46f commit 15c9eed
Show file tree
Hide file tree
Showing 10 changed files with 525 additions and 2,716 deletions.
8 changes: 8 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.vs
Debug*
Release*
x64

*.suo
*.sdf
*.vcxproj.user
36 changes: 36 additions & 0 deletions BulletSharp.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ Global
Debug OpenTK|x64 = Debug OpenTK|x64
Debug SharpDX|Win32 = Debug SharpDX|Win32
Debug SharpDX|x64 = Debug SharpDX|x64
MinSizeRel Generic|Win32 = MinSizeRel Generic|Win32
MinSizeRel Generic|x64 = MinSizeRel Generic|x64
MinSizeRel Mogre|Win32 = MinSizeRel Mogre|Win32
MinSizeRel Mogre|x64 = MinSizeRel Mogre|x64
MinSizeRel MonoGame|Win32 = MinSizeRel MonoGame|Win32
MinSizeRel MonoGame|x64 = MinSizeRel MonoGame|x64
MinSizeRel Numerics|Win32 = MinSizeRel Numerics|Win32
MinSizeRel Numerics|x64 = MinSizeRel Numerics|x64
MinSizeRel OpenTK|Win32 = MinSizeRel OpenTK|Win32
MinSizeRel OpenTK|x64 = MinSizeRel OpenTK|x64
MinSizeRel SharpDX|Win32 = MinSizeRel SharpDX|Win32
MinSizeRel SharpDX|x64 = MinSizeRel SharpDX|x64
Release Generic|Win32 = Release Generic|Win32
Release Generic|x64 = Release Generic|x64
Release Mogre|Win32 = Release Mogre|Win32
Expand Down Expand Up @@ -57,6 +69,30 @@ Global
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.Debug SharpDX|Win32.Build.0 = Debug SharpDX|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.Debug SharpDX|x64.ActiveCfg = Debug SharpDX|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.Debug SharpDX|x64.Build.0 = Debug SharpDX|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Generic|Win32.ActiveCfg = MinSizeRel Generic|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Generic|Win32.Build.0 = MinSizeRel Generic|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Generic|x64.ActiveCfg = MinSizeRel Generic|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Generic|x64.Build.0 = MinSizeRel Generic|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Mogre|Win32.ActiveCfg = MinSizeRel Mogre|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Mogre|Win32.Build.0 = MinSizeRel Mogre|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Mogre|x64.ActiveCfg = MinSizeRel Mogre|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Mogre|x64.Build.0 = MinSizeRel Mogre|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel MonoGame|Win32.ActiveCfg = MinSizeRel MonoGame|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel MonoGame|Win32.Build.0 = MinSizeRel MonoGame|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel MonoGame|x64.ActiveCfg = MinSizeRel MonoGame|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel MonoGame|x64.Build.0 = MinSizeRel MonoGame|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Numerics|Win32.ActiveCfg = MinSizeRel Numerics|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Numerics|Win32.Build.0 = MinSizeRel Numerics|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Numerics|x64.ActiveCfg = MinSizeRel Numerics|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel Numerics|x64.Build.0 = MinSizeRel Numerics|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel OpenTK|Win32.ActiveCfg = MinSizeRel OpenTK|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel OpenTK|Win32.Build.0 = MinSizeRel OpenTK|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel OpenTK|x64.ActiveCfg = MinSizeRel OpenTK|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel OpenTK|x64.Build.0 = MinSizeRel OpenTK|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel SharpDX|Win32.ActiveCfg = MinSizeRel SharpDX|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel SharpDX|Win32.Build.0 = MinSizeRel SharpDX|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel SharpDX|x64.ActiveCfg = MinSizeRel SharpDX|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.MinSizeRel SharpDX|x64.Build.0 = MinSizeRel SharpDX|x64
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.Release Generic|Win32.ActiveCfg = Release Generic|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.Release Generic|Win32.Build.0 = Release Generic|Win32
{5A0DEF7E-B7E3-45E9-A511-0F03CECFF8C0}.Release Generic|x64.ActiveCfg = Release Generic|x64
Expand Down
489 changes: 460 additions & 29 deletions BulletSharp.vcxproj
View file

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions build_all.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ set VCPATH="%PROGFILES%\Microsoft Visual Studio 14.0\VC\vcpackages"
set OPTS=BulletSharp.vcxproj /p:VCBuildToolPath=%VCPATH% /p:VisualStudioVersion=14.0
rem set OPTS=%OPTS% /p:Platform=x64

%MSBUILD% %OPTS% /p:Configuration="Release Generic"
%MSBUILD% %OPTS% /p:Configuration="Release Mogre"
%MSBUILD% %OPTS% /p:Configuration="Release MonoGame"
%MSBUILD% %OPTS% /p:Configuration="Release Numerics"
%MSBUILD% %OPTS% /p:Configuration="Release OpenTK"
%MSBUILD% %OPTS% /p:Configuration="Release SharpDX"
set CONF=Release

%MSBUILD% %OPTS% /p:Configuration="%CONF% Generic"
%MSBUILD% %OPTS% /p:Configuration="%CONF% Mogre"
%MSBUILD% %OPTS% /p:Configuration="%CONF% MonoGame"
%MSBUILD% %OPTS% /p:Configuration="%CONF% Numerics"
%MSBUILD% %OPTS% /p:Configuration="%CONF% OpenTK"
%MSBUILD% %OPTS% /p:Configuration="%CONF% SharpDX"
14 changes: 11 additions & 3 deletions src/Stdafx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,10 @@ using namespace System::Drawing;
#ifndef DISABLE_HACD
#if _DEBUG
#pragma comment(lib, "HACD_Debug.lib")
#else
#elif defined(MINSIZEREL)
#pragma comment(lib, "HACD_MinSizeRel.lib")
#else
#pragma comment(lib, "HACD.lib")
#endif
#include <hacdHACD.h>
#endif
Expand All @@ -232,10 +234,14 @@ using namespace System::Drawing;
#pragma comment(lib, "BulletWorldImporter_Debug.lib")
#pragma comment(lib, "BulletXmlWorldImporter_Debug.lib")
#pragma comment(lib, "BulletFileLoader_Debug.lib")
#else
#elif defined(MINSIZEREL)
#pragma comment(lib, "BulletWorldImporter_MinSizeRel.lib")
#pragma comment(lib, "BulletXmlWorldImporter_MinSizeRel.lib")
#pragma comment(lib, "BulletFileLoader_MinSizeRel.lib")
#else
#pragma comment(lib, "BulletWorldImporter.lib")
#pragma comment(lib, "BulletXmlWorldImporter.lib")
#pragma comment(lib, "BulletFileLoader.lib")
#endif
#ifdef DISABLE_GIMPACT
#include <BulletCollision/GImpact/btGImpactShape.h>
Expand All @@ -247,8 +253,10 @@ using namespace System::Drawing;
#ifndef DISABLE_SOFTBODY
#if _DEBUG
#pragma comment(lib, "BulletSoftBody_Debug.lib")
#else
#elif defined(MINSIZEREL)
#pragma comment(lib, "BulletSoftBody_MinSizeRel.lib")
#else
#pragma comment(lib, "BulletSoftBody.lib")
#endif
#include <BulletSoftBody/btDefaultSoftBodySolver.h>
#include <BulletSoftBody/btSoftBody.h>
Expand Down
98 changes: 0 additions & 98 deletions vs2010/BulletSharp.sln
View file

This file was deleted.

Loading

0 comments on commit 15c9eed

Please sign in to comment.