diff --git a/mk/jam/msvcgen.jam b/mk/jam/msvcgen.jam
index 49f00c1cb..61706067d 100644
--- a/mk/jam/msvcgen.jam
+++ b/mk/jam/msvcgen.jam
@@ -190,13 +190,6 @@ rule MsvcCFlags1 { }
rule MsvcLFlags { MsvcLFlags1 $(1) : $(2) : $(3) ; }
rule MsvcLFlags1 { }
-## MsvcExtraFile target : files
-## Use this rule to add extra file resources to the "Resource files"
-## filter of the generated project. Commonly, those files are auxiliary
-## files not specified in the source file list, e.g. ".inc" files.
-rule MsvcExtraFile { MsvcExtraFile1 $(1) : $(2) ; }
-rule MsvcExtraFile1 { }
-
## MsvcGenName target : name
## Assign an MSVC project name to 'target'. Normally, the project name is
## 'target' with a prefix of "app", "grp", "lib", "plg", or "wks", depending
@@ -688,11 +681,6 @@ rule MsvcProject
local sources = $(4) ;
local options = $(5) ;
local relpath = [ Property msvcgen : relpath$(MSVC_VERSION) ] ;
- local relpathcommon = [ Property msvcgen : relpathcommon ] ;
- if "$(relpathcommon)" = ""
- {
- relpathcommon = $(relpath) ;
- }
local outdir = [ Property msvcgen : outdir$(MSVC_VERSION) ] ;
local outdircommon = [ Property msvcgen : outdircommon ] ;
if "$(outdircommon)" = ""
@@ -845,7 +833,8 @@ rule MsvcProject
{
local iconrc = $(resource:S=.iconrctmp) ;
# RELPATH includes trailing slash (hence the "" in ConcatDirs).
- RELPATH on $(iconrc) = [ ConcatDirs $(relpathcommon) "" ] ;
+ RELPATH on $(iconrc) =
+ [ ConcatDirs [ Property msvcgen : relpath$(MSVC_VERSION) ] "" ] ;
MakeLocate $(iconrc) : $(workdircommon) ;
Depends $(iconrc) : $(icon) ;
Depends $(iconrc) : $(SUBDIR)/Jamfile ;
@@ -1096,11 +1085,10 @@ rule StaticPluginLibrary
{
targets = [ Filter $(targets) : $(rejects) ] ;
}
- local sources extlibs ;
+ local sources ;
for t in $(targets)
{
sources += $(STATICPLUGINS.SOURCES.$(t)) ;
- extlibs += $($(t).EXTERNALLIBS) ;
}
$(name)_STATIC = "yes" ;
@@ -1108,7 +1096,6 @@ rule StaticPluginLibrary
Library $(name) : $(sources) ;
MsvcDefine $(name) : CS_STATIC_LINKED ;
_MsvcDefine $(name) : $(STATICPLUGINS.MSVC_DEFINES) ;
- ExternalLibs $(name) : [ RemoveDups $(extlibs) ] ;
# Write out needed CFLAGS, LFLAGS
local outdir = [ Property msvcgen : outdircommon ] ;
@@ -1365,20 +1352,6 @@ rule MsvcLFlags1
_MsvcRespEmit $(1) : $(2) : lflags : $(3) ;
}
-# MsvcLFlags target : files
-# (See documentation above.)
-rule MsvcExtraFile1
-{
- local rawname = $(1) ;
- local files = $(2) ;
-
- local respfile = $($(rawname)_PRJ_RESPFILE) ;
- local respdir = $($(rawname)_PRJ_RESPDIR) ;
-
- ResponseFile $(respfile) : "file|$(files)" : notfile :
- $(respdir) ;
-}
-
# _MsvcIncDirs target : incdirs [ : mode ]
# Helper for ExternalLibs which processes the contents of TAG.INCDIRS for
# an external library.
diff --git a/msvc/6/libbullet.dsp b/msvc/6/libbullet.dsp
index ad0a21bc7..01b61deb3 100644
--- a/msvc/6/libbullet.dsp
+++ b/msvc/6/libbullet.dsp
@@ -184,6 +184,10 @@ SOURCE=..\..\Bullet\CollisionShapes\CompoundShape.cpp
# End Source File
# Begin Source File
+SOURCE=..\..\Bullet\CollisionShapes\ConcaveShape.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Bullet\CollisionShapes\ConeShape.cpp
# End Source File
# Begin Source File
@@ -232,6 +236,10 @@ SOURCE=..\..\Bullet\CollisionShapes\SphereShape.cpp
# End Source File
# Begin Source File
+SOURCE=..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp
# End Source File
# Begin Source File
@@ -396,6 +404,10 @@ SOURCE=..\..\Bullet\CollisionShapes\CompoundShape.h
# End Source File
# Begin Source File
+SOURCE=..\..\Bullet\CollisionShapes\ConcaveShape.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Bullet\CollisionShapes\ConeShape.h
# End Source File
# Begin Source File
@@ -444,6 +456,10 @@ SOURCE=..\..\Bullet\CollisionShapes\SphereShape.h
# End Source File
# Begin Source File
+SOURCE=..\..\Bullet\CollisionShapes\StaticPlaneShape.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.h
# End Source File
# Begin Source File
diff --git a/msvc/7/libbullet.vcproj b/msvc/7/libbullet.vcproj
index 87dfecaa2..bbedf58e1 100644
--- a/msvc/7/libbullet.vcproj
+++ b/msvc/7/libbullet.vcproj
@@ -221,6 +221,9 @@
+
+
@@ -257,6 +260,9 @@
+
+
@@ -381,6 +387,9 @@
+
+
@@ -417,6 +426,9 @@
+
+
diff --git a/msvc/71/libbullet.vcproj b/msvc/71/libbullet.vcproj
index 23ba199e1..4850d45b6 100644
--- a/msvc/71/libbullet.vcproj
+++ b/msvc/71/libbullet.vcproj
@@ -221,6 +221,9 @@
+
+
@@ -257,6 +260,9 @@
+
+
@@ -381,6 +387,9 @@
+
+
@@ -417,6 +426,9 @@
+
+
diff --git a/msvc/8/libbullet.vcproj b/msvc/8/libbullet.vcproj
index de9390b2c..25bccf739 100644
--- a/msvc/8/libbullet.vcproj
+++ b/msvc/8/libbullet.vcproj
@@ -221,6 +221,9 @@
+
+
@@ -257,6 +260,9 @@
+
+
@@ -381,6 +387,9 @@
+
+
@@ -417,6 +426,9 @@
+
+
diff --git a/msvc/appCcdPhysicsDemo.rc b/msvc/appCcdPhysicsDemo.rc
index 9049ccde7..1b23b8041 100644
--- a/msvc/appCcdPhysicsDemo.rc
+++ b/msvc/appCcdPhysicsDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appColladaDemo.rc b/msvc/appColladaDemo.rc
index 2f9ae58a1..624fe5465 100644
--- a/msvc/appColladaDemo.rc
+++ b/msvc/appColladaDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appCollisionDemo.rc b/msvc/appCollisionDemo.rc
index c6ebea5cb..f5bcbd59e 100644
--- a/msvc/appCollisionDemo.rc
+++ b/msvc/appCollisionDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appCollisionInterfaceDemo.rc b/msvc/appCollisionInterfaceDemo.rc
index 7b4964da7..8fbe31910 100644
--- a/msvc/appCollisionInterfaceDemo.rc
+++ b/msvc/appCollisionInterfaceDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appConcaveDemo.rc b/msvc/appConcaveDemo.rc
index 6fdc0ffcf..4bf8c7921 100644
--- a/msvc/appConcaveDemo.rc
+++ b/msvc/appConcaveDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appConstraintDemo.rc b/msvc/appConstraintDemo.rc
index f176e9b55..2c2728fda 100644
--- a/msvc/appConstraintDemo.rc
+++ b/msvc/appConstraintDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appContinuousConvexCollision.rc b/msvc/appContinuousConvexCollision.rc
index d54369951..04062ee0f 100644
--- a/msvc/appContinuousConvexCollision.rc
+++ b/msvc/appContinuousConvexCollision.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appConvexDecompositionDemo.rc b/msvc/appConvexDecompositionDemo.rc
index 38974cddf..0458ecd58 100644
--- a/msvc/appConvexDecompositionDemo.rc
+++ b/msvc/appConvexDecompositionDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appGjkConvexCastDemo.rc b/msvc/appGjkConvexCastDemo.rc
index abc554287..da58431f5 100644
--- a/msvc/appGjkConvexCastDemo.rc
+++ b/msvc/appGjkConvexCastDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appRaytracer.rc b/msvc/appRaytracer.rc
index 3e9afd02b..bc754ed96 100644
--- a/msvc/appRaytracer.rc
+++ b/msvc/appRaytracer.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"
diff --git a/msvc/appSimplexDemo.rc b/msvc/appSimplexDemo.rc
index e14e1e55a..3bf167340 100644
--- a/msvc/appSimplexDemo.rc
+++ b/msvc/appSimplexDemo.rc
@@ -27,4 +27,4 @@ FILEFLAGS 0x0
}
}
}
-1 ICON "../msvc/bullet_ico.ico"
+1 ICON "../../msvc/bullet_ico.ico"