Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated projectfiles

Browse Source
This commit is contained in:
ejcoumans
2006-07-04 17:32:48 +00:00
parent 62593f8b99
commit 6163b42e8c
16 changed files with 66 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mk/jam/msvcgen.jam
View File

@@ -190,13 +190,6 @@ rule MsvcCFlags1 { }
rule MsvcLFlags { MsvcLFlags1 $(1) : $(2) : $(3) ; } rule MsvcLFlags { MsvcLFlags1 $(1) : $(2) : $(3) ; }
rule MsvcLFlags1 { } 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 ## MsvcGenName target : name
## Assign an MSVC project name to 'target'. Normally, the project name is ## Assign an MSVC project name to 'target'. Normally, the project name is
## 'target' with a prefix of "app", "grp", "lib", "plg", or "wks", depending ## 'target' with a prefix of "app", "grp", "lib", "plg", or "wks", depending
@@ -688,11 +681,6 @@ rule MsvcProject
local sources = $(4) ; local sources = $(4) ;
local options = $(5) ; local options = $(5) ;
local relpath = [ Property msvcgen : relpath$(MSVC_VERSION) ] ; local relpath = [ Property msvcgen : relpath$(MSVC_VERSION) ] ;
local relpathcommon = [ Property msvcgen : relpathcommon ] ;
if "$(relpathcommon)" = ""
{
relpathcommon = $(relpath) ;
}
local outdir = [ Property msvcgen : outdir$(MSVC_VERSION) ] ; local outdir = [ Property msvcgen : outdir$(MSVC_VERSION) ] ;
local outdircommon = [ Property msvcgen : outdircommon ] ; local outdircommon = [ Property msvcgen : outdircommon ] ;
if "$(outdircommon)" = "" if "$(outdircommon)" = ""
@@ -845,7 +833,8 @@ rule MsvcProject
{ {
local iconrc = $(resource:S=.iconrctmp) ; local iconrc = $(resource:S=.iconrctmp) ;
# RELPATH includes trailing slash (hence the "" in ConcatDirs). # 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) ; MakeLocate $(iconrc) : $(workdircommon) ;
Depends $(iconrc) : $(icon) ; Depends $(iconrc) : $(icon) ;
Depends $(iconrc) : $(SUBDIR)/Jamfile ; Depends $(iconrc) : $(SUBDIR)/Jamfile ;
@@ -1096,11 +1085,10 @@ rule StaticPluginLibrary
{ {
targets = [ Filter $(targets) : $(rejects) ] ; targets = [ Filter $(targets) : $(rejects) ] ;
} }
local sources extlibs ; local sources ;
for t in $(targets) for t in $(targets)
{ {
sources += $(STATICPLUGINS.SOURCES.$(t)) ; sources += $(STATICPLUGINS.SOURCES.$(t)) ;
extlibs += $($(t).EXTERNALLIBS) ;
} }
$(name)_STATIC = "yes" ; $(name)_STATIC = "yes" ;
@@ -1108,7 +1096,6 @@ rule StaticPluginLibrary
Library $(name) : $(sources) ; Library $(name) : $(sources) ;
MsvcDefine $(name) : CS_STATIC_LINKED ; MsvcDefine $(name) : CS_STATIC_LINKED ;
_MsvcDefine $(name) : $(STATICPLUGINS.MSVC_DEFINES) ; _MsvcDefine $(name) : $(STATICPLUGINS.MSVC_DEFINES) ;
ExternalLibs $(name) : [ RemoveDups $(extlibs) ] ;
# Write out needed CFLAGS, LFLAGS # Write out needed CFLAGS, LFLAGS
local outdir = [ Property msvcgen : outdircommon ] ; local outdir = [ Property msvcgen : outdircommon ] ;
@@ -1365,20 +1352,6 @@ rule MsvcLFlags1
_MsvcRespEmit $(1) : $(2) : lflags : $(3) ; _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 ] # _MsvcIncDirs target : incdirs [ : mode ]
# Helper for ExternalLibs which processes the contents of TAG.INCDIRS for # Helper for ExternalLibs which processes the contents of TAG.INCDIRS for
# an external library. # an external library.

16
msvc/6/libbullet.dsp
View File

@@ -184,6 +184,10 @@ SOURCE=..\..\Bullet\CollisionShapes\CompoundShape.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\ConcaveShape.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\ConeShape.cpp SOURCE=..\..\Bullet\CollisionShapes\ConeShape.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -232,6 +236,10 @@ SOURCE=..\..\Bullet\CollisionShapes\SphereShape.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -396,6 +404,10 @@ SOURCE=..\..\Bullet\CollisionShapes\CompoundShape.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\ConcaveShape.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\ConeShape.h SOURCE=..\..\Bullet\CollisionShapes\ConeShape.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -444,6 +456,10 @@ SOURCE=..\..\Bullet\CollisionShapes\SphereShape.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\StaticPlaneShape.h
# End Source File
# Begin Source File
SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.h SOURCE=..\..\Bullet\CollisionShapes\StridingMeshInterface.h
# End Source File # End Source File
# Begin Source File # Begin Source File

12
msvc/7/libbullet.vcproj
View File

@@ -221,6 +221,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.cpp">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp">
</File> </File>
@@ -257,6 +260,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp"> RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp">
</File> </File>
@@ -381,6 +387,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h"> RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.h">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h"> RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h">
</File> </File>
@@ -417,6 +426,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h"> RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.h">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h"> RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h">
</File> </File>

12
msvc/71/libbullet.vcproj
View File

@@ -221,6 +221,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.cpp">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp">
</File> </File>
@@ -257,6 +260,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp"> RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp">
</File> </File>
@@ -381,6 +387,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h"> RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.h">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h"> RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h">
</File> </File>
@@ -417,6 +426,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h"> RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.h">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h"> RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h">
</File> </File>

12
msvc/8/libbullet.vcproj
View File

@@ -221,6 +221,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.cpp">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.cpp">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\ConeShape.cpp">
</File> </File>
@@ -257,6 +260,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp"> RelativePath="..\..\Bullet\CollisionShapes\SphereShape.cpp">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.cpp">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp"> RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.cpp">
</File> </File>
@@ -381,6 +387,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h"> RelativePath="..\..\Bullet\CollisionShapes\CompoundShape.h">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\ConcaveShape.h">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h"> RelativePath="..\..\Bullet\CollisionShapes\ConeShape.h">
</File> </File>
@@ -417,6 +426,9 @@
<File <File
RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h"> RelativePath="..\..\Bullet\CollisionShapes\SphereShape.h">
</File> </File>
<File
RelativePath="..\..\Bullet\CollisionShapes\StaticPlaneShape.h">
</File>
<File <File
RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h"> RelativePath="..\..\Bullet\CollisionShapes\StridingMeshInterface.h">
</File> </File>

2
msvc/appCcdPhysicsDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appColladaDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appCollisionDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appCollisionInterfaceDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appConcaveDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appConstraintDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appContinuousConvexCollision.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appConvexDecompositionDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appGjkConvexCastDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appRaytracer.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"

2
msvc/appSimplexDemo.rc
View File

@@ -27,4 +27,4 @@ FILEFLAGS 0x0
} }
} }
} }
1 ICON "../msvc/bullet_ico.ico" 1 ICON "../../msvc/bullet_ico.ico"