opende-svn — Open Dynamics Engine Subversion commit notifications

[Opende-svn] SF.net SVN: opende: [883] branches/0.6/ode/src

[<jas...@us...>]

Revision: 883
Author:   jason379
Date:     2006-03-31 09:10:31 -0800 (Fri, 31 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=883&view=rev

Log Message:
-----------
Started work on documentation

Modified Paths:
--------------
    branches/0.6/ode/src/ode.cpp

Added Paths:
-----------
    branches/0.6/ode/doc/Doxyfile
    branches/0.6/ode/doc/concepts.dox
    branches/0.6/ode/doc/installation.dox
    branches/0.6/ode/doc/introduction.dox
    branches/0.6/ode/doc/main.dox
    branches/0.6/ode/doc/modules.dox
Added: branches/0.6/ode/doc/Doxyfile
===================================================================
--- branches/0.6/ode/doc/Doxyfile	                        (rev 0)
+++ branches/0.6/ode/doc/Doxyfile	2006-03-31 17:10:31 UTC (rev 883)
@@ -0,0 +1,1237 @@
+# Doxyfile 1.4.6-NO
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "Open Dynamics Engine"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../../docs
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = YES
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 3
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = . ../src
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+
+FILE_PATTERNS          = *.c *.cpp *.dox
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = pix
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = .
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that a graph may be further truncated if the graph's 
+# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
+# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
+# the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO

Added: branches/0.6/ode/doc/concepts.dox
===================================================================
--- branches/0.6/ode/doc/concepts.dox	                        (rev 0)
+++ branches/0.6/ode/doc/concepts.dox	2006-03-31 17:10:31 UTC (rev 883)
@@ -0,0 +1,32 @@
+/**
+@page concepts Basic Concepts
+
+@section Background
+
+[Here is where I will write some background information about rigid body 
+dynamics and simulation. But in the meantime, please refer to Baraff's 
+excellent 
+<a href="http://www.cs.cmu.edu/~baraff/sigcourse/index.html">SIGGRAPH tutorial</a>].
+
+@section Rigid Bodies
+
+A rigid body has various properties from the point of view of the simulation. 
+Some properties change over time:
+
+@li Position vector (x,y,z) of the body's point of reference. Currently the point of reference must correspond to the body's center of mass.
+@li Linear velocity of the point of reference, a vector (vx,vy,vz).
+@li Orientation of a body, represented by a quaternion (qs,qx,qy,qz) or a 3x3 rotation matrix.
+@li Angular velocity vector (wx,wy,wz) which describes how the orientation changes over time.
+
+Other body properties are usually constant over time:
+
+@li Mass of the body.
+@li Position of the center of mass with respect to the point of reference. In the current implementation the center of mass and the point of reference must coincide.
+@li Inertia matrix. This is a 3x3 matrix that describes how the body's mass is distributed around the center of mass. 
+
+Conceptually each body has an x-y-z coordinate frame embedded in it, that 
+moves and rotates with the body, as shown in figure 1.
+
+@image html body.jpg "Figure 1. The body coordinate frame"
+
+*/

Added: branches/0.6/ode/doc/installation.dox
===================================================================
--- branches/0.6/ode/doc/installation.dox	                        (rev 0)
+++ branches/0.6/ode/doc/installation.dox	2006-03-31 17:10:31 UTC (rev 883)
@@ -0,0 +1,6 @@
+/**
+@page installation Installation
+
+This section needs to be rewritten.
+
+*/
\ No newline at end of file

Added: branches/0.6/ode/doc/introduction.dox
===================================================================
--- branches/0.6/ode/doc/introduction.dox	                        (rev 0)
+++ branches/0.6/ode/doc/introduction.dox	2006-03-31 17:10:31 UTC (rev 883)
@@ -0,0 +1,72 @@
+/**
+@page introduction About ODE
+
+@section license ODE's License
+
+ODE is Copyright &copy; 2001-2004 Russell L. Smith. All rights reserved.
+
+This library is free software; you can redistribute it and/or modify it under 
+the terms of EITHER:
+
+   1. The GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. The text of the GNU Lesser General Public License is included with this library in the file LICENSE.TXT.
+   2. The BSD-style license that is included with this library in the file LICENSE-BSD.TXT. 
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY 
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+PARTICULAR PURPOSE. See the files LICENSE.TXT and LICENSE-BSD.TXT for more details.
+
+
+@section features Features
+
+ODE is good for simulating articulated rigid body structures. An articulated
+structure is created when rigid bodies of various shapes are connected 
+together with joints of various kinds. Examples are ground vehicles (where 
+the wheels are connected to the chassis), legged creatures (where the legs 
+are connected to the body), or stacks of objects.
+
+ODE is designed to be used in interactive or real-time simulation. It is 
+particularly good for simulating moving objects in changeable virtual reality 
+environments. This is because it is fast, robust and stable, and the user has 
+complete freedom to change the structure of the system even while the 
+simulation is running.
+
+ODE uses a highly stable integrator, so that the simulation errors should not 
+grow out of control. The physical meaning of this is that the simulated system 
+should not "explode" for no reason (believe me, this happens a lot with other 
+simulators if you are not careful). ODE emphasizes speed and stability over 
+physical accuracy.
+
+ODE has hard contacts. This means that a special non-penetration constraint is 
+used whenever two bodies collide. The alternative, used in many other simulators, 
+is to use virtual springs to represent contacts. This is difficult to do right 
+and extremely error-prone.
+
+ODE has a built-in collision detection system. However you can ignore it and do 
+your own collision detection if you want to. The current collision primitives are 
+sphere, box, capped cylinder, plane, ray, and triangular mesh - more collision 
+objects will come later. ODE's collision system provides fast identification of 
+potentially intersecting objects, through the concept of "spaces".
+
+Here are the features:
+@li Rigid bodies with arbitrary mass distribution.
+@li Joint types: ball-and-socket, hinge, slider (prismatic), hinge-2, fixed, angular motor, universal.
+@li Collision primitives: sphere, box, capped cylinder, plane, ray, and triangular mesh.
+@li Collision spaces: Quad tree, hash space, and simple.
+@li Simulation method: The equations of motion are derived from a Lagrange multiplier velocity based model due to Trinkle/Stewart and Anitescu/Potra.
+@li A first order integrator is being used. It's fast, but not accurate enough for quantitative engineering yet. Higher order integrators will come later.
+@li Choice of time stepping methods: either the standard ``big matrix'' method or the newer iterative QuickStep method can be used.
+@li Contact and friction model: This is based on the Dantzig LCP solver described by Baraff, although ODE implements a faster approximation to the Coloumb friction model.
+@li Has a native C interface (even though ODE is mostly written in C++).
+@li Has a C++ interface built on top of the C one.
+@li Many unit tests, and more being written all the time.
+@li Platform specific optimizations.
+@li Other stuff I forgot to mention... 
+
+
+@section community The ODE Community
+
+Do you have questions or comments about ODE? Think you can help? Please write to 
+<a href="http://q12.org/mailman/listinfo/ode">the ODE mailing list</a>.
+
+*/
+

Added: branches/0.6/ode/doc/main.dox
===================================================================
--- branches/0.6/ode/doc/main.dox	                        (rev 0)
+++ branches/0.6/ode/doc/main.dox	2006-03-31 17:10:31 UTC (rev 883)
@@ -0,0 +1,24 @@
+/**
+@mainpage Open Dynamics Engine User Guide
+ 
+<center><em>This document is &copy; Russell Smith and the ODE Project</em></center>
+
+The Open Dynamics Engine (ODE) is a free, industrial quality library for 
+simulating articulated rigid body dynamics. For example, it is good for 
+simulating ground vehicles, legged creatures, and moving objects in VR 
+environments. It is fast, flexible and robust, and it has built-in collision 
+detection. ODE is being developed by <a href="http://www.q12.org/">Russell 
+Smith</a> with help from several 
+<a href="http://ode.org/community.html">contributors</a>.
+
+If "rigid body simulation" does not make much sense to you, check out 
+<a href="http://opende.sourceforge.net/slides/slides.html">What is a 
+Physics SDK?</a>.
+
+
+@li @ref introduction
+@li @ref installation
+@li @ref concepts
+
+*/
+ 

Added: branches/0.6/ode/doc/modules.dox
=============...
 
[truncated message content]

[Opende-svn] SF.net SVN: opende: [882] branches/0.6

[<jas...@us...>]

Revision: 882
Author:   jason379
Date:     2006-03-31 06:32:07 -0800 (Fri, 31 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=882&view=rev

Log Message:
-----------
Merged with trunk (r880:881)

Added Paths:
-----------
    branches/0.6/CHANGELOG.txt
    branches/0.6/README.txt
    branches/0.6/tools/ftp_msw_script
    branches/0.6/tools/msw-release.bat
    branches/0.6/tools/posix-release.sh

Removed Paths:
-------------
    branches/0.6/CHANGELOG
    branches/0.6/README
    branches/0.6/lib/.cvsignore
Deleted: branches/0.6/CHANGELOG
===================================================================
--- branches/0.6/CHANGELOG	2006-03-30 18:23:24 UTC (rev 881)
+++ branches/0.6/CHANGELOG	2006-03-31 14:32:07 UTC (rev 882)
@@ -1,412 +0,0 @@
-ODE CHANGELOG
--------------
-
-the rules for this file:
-  * entries are sorted newest-first.
-  * summarize sets of changes - dont reproduce every CVS log comment here.
-  * don't ever delete anything.
-  * keep the format consistent (79 char width, M/D/Y date format).
-
-------------------------------------------------------------------------------
-03/20/06 jason379
-
-	* Added new autogenerated Visual Studio projects, with Premake scripts
-	
-02/04/06 gcarlton
-
-	* Added support for geom offsets.
-
-10/26/05 rodrigo
-
-	* Removed LIBTOOL from autotools since it was not really required.
-	* Added a target to build ODE as a shared library, this shared
-	  library gets build alongside the static one, no flags required.
-
-10/24/05 tfautre
-
-	(Backported patches from STABLE branch, applied by Adam)
-	
-	* dRandInt changed for a non-double all-int version.
-	* mics minor fixes and improvements.
-
-04/05/05 tfautre
-
-	* Fixed segmentation fault with OPCODE on 64 bits systems.
-
-03/31/05 tfautre
-
-	* Fixed timer.cpp compiler error on x86-64 using GCC.
-
-03/29/05 colin
-
-	* Added trimesh preprocessing to mark unneeded edges and verts.  Also
-	  added support for preprocessed info to the ccylinder-trimesh
-	  collider.
-
-12/07/04 adam
-
-        * Important AMotors bugfix
-
-09/22/04 jeff
-
-	* Assorted small bugfixes and tweaks for
-	  trimesh_{box,ccylinder,trimesh} collisions
-
-09/21/04 jeff
-
-	* added functions to joint.cpp to allow joint attachment to moving
-	  geoms.
-
-	* added malloc-based memory allocation in step.cpp & lcp.cpp (turned
-	  on with a #define switch in common.h)
-	
-05/29/04 russ
-
-	* added joint feedback to the QuickStep solver
-
-05/18/04 russ
-
-	* added warm starting to the QuickStep solver
-
-05/18/04 russ
-
-	* added the QuickStep solver
-	
-	* added contact parameter functions.
-
-05/05/04 adam
-
-        * use dRandInt instead of rand() in stepfast.
-
-04/21/04 russ
-
-	* added auto-disable support from Aras Pranckevicius (with
-	  modifications by russ). this useful feature can speed up
-	  simulation significantly in some cases.
-	
-	* various internal tidyups.
-
-04/20/04 russ
-
-	* changed the meaning of the 'index' argument to dJointGetBody():
-	  it was the only remaining API function that does not respect
-	  dJOINT_REVERSE (spotted by Matthew D. Hancher).
-	
-	* updated the C++ headers: fixed two minor bugs and added
-	  support for dQuadTreeSpace, dRay, and the dGeom::getSpace() method
-	  (from Matthew D. Hancher).
-
-04/18/04 russ
-
-	* changed the way that the dInfinity constant is implemented: now it
-	  is #defined to be one of: FLT_MAX, DBL_MAX, HUGE_VAL, HUGE_VALF, or
-	  a large numeric constant. previously it was a variable that was
-	  exported from the library. this simplifies the configuration and
-	  build process quite a bit, especially in the case of DLLs.
-	
-	* removed the old, deprecated collision system (geom.cpp,space.cpp,
-	  geom.h,space.h,odecpp_old_collision.h). the ODE_OLD_COLLISION
-	  configuration setting no longer has any meaning.
-	
-	* removed support for dGeomGroups, which have been deprecated for
-	  a while and are equivalent to 'spaces' anyway.
-
-04/13/04 russ
-
-	* bug fix in dMassSetCappedCylinder(), from Matthew D. Hancher.
-
-04/08/04 russ
-
-	* added trimesh-CCylinder capability, from Vadim Macagon
-	  <vad...@ho...>.
-
-04/04/04 adam
-
-        * yet another rewrite of triangle-box collision code, this
-        time based on code donated by Croteam, ported by as...@je...
-        and tweaked by Erwin.
-
-04/04/04 adam
-
-        * merged trimesh-trimesh collision code by
-        Jeffrey Smith <jeffreys@Softimage.com>.
-
-        * changed it to not break the trimesh interface, fix
-        some GCC compilation problems, bring it up to date with
-        ODE changes from 2003-11-15 -> 2004-04-04.
-
-        * add ability to drop meshes on meshes in test_moving_trimesh,
-        not as good as it could be but it's illustrative.
-
-01/16/04 adam
-
-	* implement a bunch of ultra-simple TriMesh functions that were
-	in the headers but not in the code -- patch by
-	Vadim Macagon <vad...@ho...>
-
-	* disable temporal coherence on trimeshes by default, since
-	it has scaleability issues that don't make it a general clear win.
-
-12/01/03 adam
-
-	* implement dxHashSpace::collide2(), not particularly efficiently.
-
-11/14/03 adam
-
-	* applied several Trimesh fixes and improvements from
-	Aras Pranckevicius <ne...@in...>
-
-10/22/03 adam
-
-	* apply Nguyen Binh's work for removing many dSetZero() calls
-	and some other extraneous initializations.
-
-07/29/03 martin
-
-	* added dJointAdd*Torque/Force().
-
-07/10/03 russ
-
-	* added the StepFast code, by David Whittaker.
-
-07/02/03 martin
-
-	* added dMassSet*Total().
-
-07/01/03 martin
-
-	* added joint limits and motors to universal joints.
-
-	* reversed the polarity of the dJOINT_REVERSE flag.
-
-06/30/03 russ
-
-	* added the TriMesh geom class and the quad tree space to the ODE
-	  core. both of these were developed by Erwin de Vries. added OPCODE
-	  to the ODE distribution, this is required by TriMesh.
-
-06/23/03 martin
-
-	* added dGeomSetQuaternion() and dGeomGetQuaternion()
-	
-	* added dJointGet*Anchor2()
-
-05/07/03 russ
-
-	* added dGeomGetSpace().
-
-02/05/03 russ
-
-	* added dMassSetCylinder().
-
-12/07/02 russ
-
-	* added dAreConnectedExcluding().
-
-11/30/02 russ
-
-	* added the ray geom class.
-
-	* added the dGeomXXXPointDepth() functions.
-
-	* added a collision test infrastructure, and some more tests.
-
-11/24/02 russ
-
-	* added support for multiple box-box contacts.
-
-11/10/02 russ
-
-	* added new collision system. select between the old/new system by
-	  setting the ODE_OLD_COLLISION variable in config/user-settings.
-
-10/28/02 russ
-
-	* fixed two problems in the LCP code to improve the reliability of
-	  the dContactApprox1 contact mode.
-
-	* added a FAQ question about rolling bodies getting stuck when they
-	  hit multiple geoms.
-
-09/08/02 russ
-
-	* added dClosestLineSegmentPoints().
-	* implemented dCollideCB().
-
-08/28/02 russ
-
-	* added dJointSetFeedback() and dJointGetFeedback().
-
-08/05/02 russ
-
-	* added dGeomTransformSetInfo() and dGeomTransformGetInfo().
-
-07/13/02 russ
-
-	* added dBodySetForce(), dBodySetTorque(), dWorldImpulseToForce(),
-	  dBodyGetPosRelPoint(), dBodyGetPosRelPoint(), dBodyVectorToWorld(),
-	  dBodyVectorFromWorld().
-
-	* added dBodyGetPointVel() (thanks to Colin Reed).
-
-	* added a new C++ interface (from Martin C. Martin, with modifications
-	  by russ). the old C++ interface is now in odecpp_old.h.
-
-06/25/02 russ
-
-	* added an additional BSD-style licensing option for ODE.
-
-06/23/02 russ
-
-	* added dCloseODE(), contributed by Nate Waddoups and David McClurg.
-
-05/16/02 russ
-
-	* added dSpaceQuery(), contributed by Nate Waddoups.
-
-04/07/02 russ
-
-	* added a section to the documentation for universal joints.
-	  this includes a picture of the joint.
-
-04/05/02 russ
-
-	* added a universal joint class (generously contributed by
-	  Martin C. Martin). it doesn't (yet) have a motor or joint limits,
-	  but it does come with tests.
-
-03/11/02 russ
-
-	* makefile changes to accomodate OSs with command line length
-	  limitations (thanks to Norman Lin).
-
-01/06/02 russ
-
-	* added the dBodySetGravityMode() and dBodyGetGravityMode()
-	  functions, which change the dxBodyNoGravity body flag.
-
-	* added support for building a DLL with MSVC - there is now a
-	  msvc-dll target. thanks to Norman Lin for doing this.
-
-12/28/01 russ
-
-	* added the dParamCFM joint parameter.
-
-12/24/01 russ
-
-	* reworked the build system to make it more cross-platform.
-	  there is now a single top-level makefile and a configurator.c
-	  program. see the INSTALL file for details.
-
-12/04/01 russ
-
-	* the "angular motor" joint has been completed, and a new section
-	  has been added to the documentation.
-
-11/26/01 russ
-
-	* added a new joint type: "angular motor". using this joint is a good
-	  way to get ball-joint motors and limits. this is work in progress -
-	  it has not been fully implemented or tested yet.
-
-11/22/01 russ
-
-	* replaced the mmap()-based joint group stack (stack.cpp) with a
-	  malloc()-based arena stack (obstack.cpp). this will be more
-	  portable and should not impact performance.
-
-11/12/01 russ
-
-	* changed the meaning of the 'flags' parameter to dCollide() and
-	  related functions: now the size of the contact buffer is kept in
-	  the lower 16 bits. this change will be backward compatible.
-
-	* added dBodyGetFiniteRotationMode() and dBodyGetFiniteRotationAxis().
-
-	* added dBodyAddForceAtRelPos() function.
-
-11/11/01 russ
-
-	* added the ability to manually enable and disable bodies.
-	  see dBodyEnable(), dBodyDisable(), dBodyIsEnabled().
-
-	* fixed a potential bug: when a world is destroyed that contains
-	  joints in joint groups, those joints are marked as "deactivated" in
-	  the joint group, so when the joint group is destroyed they can be
-	  ignored.
-
-	* the test_boxstack demo has new options to enable and disable bodies.
-
-	* new configuration parameter in config.h: dEFFICIENT_SIZE.
-
-11/11/01 russ
-
-	* started the change log for ODE. changes older than today were added
-	  to this file by inspecting the CVS logs.
-
-11/05/01 russ
-
-	* added REAL() constructions for floating point numbers, to prevent
-	  many warnings when compiling under VC++.
-
-11/03/01 russ
-
-	* added geometry transform class, documented composite objects.
-
-	* added collision rule: no contacts if both geoms on the same body.
-	  this is not the best rule, may have to remove this in the future.
-
-	* new dMassAdd() function.
-
-	* capped cylinder to capped cylinder collision function.
-
-10/31/01 russ
-
-	* increase CFM in some demos to make them more robust.
-
-10/29/01 russ
-
-	* added new accessor functions.
-
-10/19/01 russ
-
-	* added the dJOINT_TWOBODIES flag to the joint, that says it can not
-	  be attached to just one body.
-
-10/12/01 russ
-
-	* fixed a collision bug in dCollide() that was causing memory
-	  corruption when multiple contacts were being returned.
-
-10/11/01 russ
-
-	* joints can now return m=0 to be "inactive". added a "null" joint
-	  to test this.
-
-10/09/01 russ
-
-	* in the LCP solver, try to fail gracefully when s <= 0.
-
-	* dAABBTestFn() API change.
-
-10/08/01 russ
-
-	* fixed a contact swapping bug in dCollide().
-
-10/07/01 russ
-
-	* added capped cylinder geometry object.
-
-09/30/01 russ
-
-	* the test_buggy demo now uses geometry groups.
-
-	* added a dAABBTestFn field in the geometry classes.
-
-09/29/01 russ
-
-	* added geometry groups.
-
-09/20/01 russ
-
-	* added finite rotation stuff.

Copied: branches/0.6/CHANGELOG.txt (from rev 881, trunk/CHANGELOG.txt)
===================================================================
--- branches/0.6/CHANGELOG.txt	                        (rev 0)
+++ branches/0.6/CHANGELOG.txt	2006-03-31 14:32:07 UTC (rev 882)
@@ -0,0 +1,412 @@
+ODE CHANGELOG
+-------------
+
+the rules for this file:
+  * entries are sorted newest-first.
+  * summarize sets of changes - dont reproduce every CVS log comment here.
+  * don't ever delete anything.
+  * keep the format consistent (79 char width, M/D/Y date format).
+
+------------------------------------------------------------------------------
+03/20/06 jason379
+
+	* Added new autogenerated Visual Studio projects, with Premake scripts
+	
+02/04/06 gcarlton
+
+	* Added support for geom offsets.
+
+10/26/05 rodrigo
+
+	* Removed LIBTOOL from autotools since it was not really required.
+	* Added a target to build ODE as a shared library, this shared
+	  library gets build alongside the static one, no flags required.
+
+10/24/05 tfautre
+
+	(Backported patches from STABLE branch, applied by Adam)
+	
+	* dRandInt changed for a non-double all-int version.
+	* mics minor fixes and improvements.
+
+04/05/05 tfautre
+
+	* Fixed segmentation fault with OPCODE on 64 bits systems.
+
+03/31/05 tfautre
+
+	* Fixed timer.cpp compiler error on x86-64 using GCC.
+
+03/29/05 colin
+
+	* Added trimesh preprocessing to mark unneeded edges and verts.  Also
+	  added support for preprocessed info to the ccylinder-trimesh
+	  collider.
+
+12/07/04 adam
+
+        * Important AMotors bugfix
+
+09/22/04 jeff
+
+	* Assorted small bugfixes and tweaks for
+	  trimesh_{box,ccylinder,trimesh} collisions
+
+09/21/04 jeff
+
+	* added functions to joint.cpp to allow joint attachment to moving
+	  geoms.
+
+	* added malloc-based memory allocation in step.cpp & lcp.cpp (turned
+	  on with a #define switch in common.h)
+	
+05/29/04 russ
+
+	* added joint feedback to the QuickStep solver
+
+05/18/04 russ
+
+	* added warm starting to the QuickStep solver
+
+05/18/04 russ
+
+	* added the QuickStep solver
+	
+	* added contact parameter functions.
+
+05/05/04 adam
+
+        * use dRandInt instead of rand() in stepfast.
+
+04/21/04 russ
+
+	* added auto-disable support from Aras Pranckevicius (with
+	  modifications by russ). this useful feature can speed up
+	  simulation significantly in some cases.
+	
+	* various internal tidyups.
+
+04/20/04 russ
+
+	* changed the meaning of the 'index' argument to dJointGetBody():
+	  it was the only remaining API function that does not respect
+	  dJOINT_REVERSE (spotted by Matthew D. Hancher).
+	
+	* updated the C++ headers: fixed two minor bugs and added
+	  support for dQuadTreeSpace, dRay, and the dGeom::getSpace() method
+	  (from Matthew D. Hancher).
+
+04/18/04 russ
+
+	* changed the way that the dInfinity constant is implemented: now it
+	  is #defined to be one of: FLT_MAX, DBL_MAX, HUGE_VAL, HUGE_VALF, or
+	  a large numeric constant. previously it was a variable that was
+	  exported from the library. this simplifies the configuration and
+	  build process quite a bit, especially in the case of DLLs.
+	
+	* removed the old, deprecated collision system (geom.cpp,space.cpp,
+	  geom.h,space.h,odecpp_old_collision.h). the ODE_OLD_COLLISION
+	  configuration setting no longer has any meaning.
+	
+	* removed support for dGeomGroups, which have been deprecated for
+	  a while and are equivalent to 'spaces' anyway.
+
+04/13/04 russ
+
+	* bug fix in dMassSetCappedCylinder(), from Matthew D. Hancher.
+
+04/08/04 russ
+
+	* added trimesh-CCylinder capability, from Vadim Macagon
+	  <vad...@ho...>.
+
+04/04/04 adam
+
+        * yet another rewrite of triangle-box collision code, this
+        time based on code donated by Croteam, ported by as...@je...
+        and tweaked by Erwin.
+
+04/04/04 adam
+
+        * merged trimesh-trimesh collision code by
+        Jeffrey Smith <jeffreys@Softimage.com>.
+
+        * changed it to not break the trimesh interface, fix
+        some GCC compilation problems, bring it up to date with
+        ODE changes from 2003-11-15 -> 2004-04-04.
+
+        * add ability to drop meshes on meshes in test_moving_trimesh,
+        not as good as it could be but it's illustrative.
+
+01/16/04 adam
+
+	* implement a bunch of ultra-simple TriMesh functions that were
+	in the headers but not in the code -- patch by
+	Vadim Macagon <vad...@ho...>
+
+	* disable temporal coherence on trimeshes by default, since
+	it has scaleability issues that don't make it a general clear win.
+
+12/01/03 adam
+
+	* implement dxHashSpace::collide2(), not particularly efficiently.
+
+11/14/03 adam
+
+	* applied several Trimesh fixes and improvements from
+	Aras Pranckevicius <ne...@in...>
+
+10/22/03 adam
+
+	* apply Nguyen Binh's work for removing many dSetZero() calls
+	and some other extraneous initializations.
+
+07/29/03 martin
+
+	* added dJointAdd*Torque/Force().
+
+07/10/03 russ
+
+	* added the StepFast code, by David Whittaker.
+
+07/02/03 martin
+
+	* added dMassSet*Total().
+
+07/01/03 martin
+
+	* added joint limits and motors to universal joints.
+
+	* reversed the polarity of the dJOINT_REVERSE flag.
+
+06/30/03 russ
+
+	* added the TriMesh geom class and the quad tree space to the ODE
+	  core. both of these were developed by Erwin de Vries. added OPCODE
+	  to the ODE distribution, this is required by TriMesh.
+
+06/23/03 martin
+
+	* added dGeomSetQuaternion() and dGeomGetQuaternion()
+	
+	* added dJointGet*Anchor2()
+
+05/07/03 russ
+
+	* added dGeomGetSpace().
+
+02/05/03 russ
+
+	* added dMassSetCylinder().
+
+12/07/02 russ
+
+	* added dAreConnectedExcluding().
+
+11/30/02 russ
+
+	* added the ray geom class.
+
+	* added the dGeomXXXPointDepth() functions.
+
+	* added a collision test infrastructure, and some more tests.
+
+11/24/02 russ
+
+	* added support for multiple box-box contacts.
+
+11/10/02 russ
+
+	* added new collision system. select between the old/new system by
+	  setting the ODE_OLD_COLLISION variable in config/user-settings.
+
+10/28/02 russ
+
+	* fixed two problems in the LCP code to improve the reliability of
+	  the dContactApprox1 contact mode.
+
+	* added a FAQ question about rolling bodies getting stuck when they
+	  hit multiple geoms.
+
+09/08/02 russ
+
+	* added dClosestLineSegmentPoints().
+	* implemented dCollideCB().
+
+08/28/02 russ
+
+	* added dJointSetFeedback() and dJointGetFeedback().
+
+08/05/02 russ
+
+	* added dGeomTransformSetInfo() and dGeomTransformGetInfo().
+
+07/13/02 russ
+
+	* added dBodySetForce(), dBodySetTorque(), dWorldImpulseToForce(),
+	  dBodyGetPosRelPoint(), dBodyGetPosRelPoint(), dBodyVectorToWorld(),
+	  dBodyVectorFromWorld().
+
+	* added dBodyGetPointVel() (thanks to Colin Reed).
+
+	* added a new C++ interface (from Martin C. Martin, with modifications
+	  by russ). the old C++ interface is now in odecpp_old.h.
+
+06/25/02 russ
+
+	* added an additional BSD-style licensing option for ODE.
+
+06/23/02 russ
+
+	* added dCloseODE(), contributed by Nate Waddoups and David McClurg.
+
+05/16/02 russ
+
+	* added dSpaceQuery(), contributed by Nate Waddoups.
+
+04/07/02 russ
+
+	* added a section to the documentation for universal joints.
+	  this includes a picture of the joint.
+
+04/05/02 russ
+
+	* added a universal joint class (generously contributed by
+	  Martin C. Martin). it doesn't (yet) have a motor or joint limits,
+	  but it does come with tests.
+
+03/11/02 russ
+
+	* makefile changes to accomodate OSs with command line length
+	  limitations (thanks to Norman Lin).
+
+01/06/02 russ
+
+	* added the dBodySetGravityMode() and dBodyGetGravityMode()
+	  functions, which change the dxBodyNoGravity body flag.
+
+	* added support for building a DLL with MSVC - there is now a
+	  msvc-dll target. thanks to Norman Lin for doing this.
+
+12/28/01 russ
+
+	* added the dParamCFM joint parameter.
+
+12/24/01 russ
+
+	* reworked the build system to make it more cross-platform.
+	  there is now a single top-level makefile and a configurator.c
+	  program. see the INSTALL file for details.
+
+12/04/01 russ
+
+	* the "angular motor" joint has been completed, and a new section
+	  has been added to the documentation.
+
+11/26/01 russ
+
+	* added a new joint type: "angular motor". using this joint is a good
+	  way to get ball-joint motors and limits. this is work in progress -
+	  it has not been fully implemented or tested yet.
+
+11/22/01 russ
+
+	* replaced the mmap()-based joint group stack (stack.cpp) with a
+	  malloc()-based arena stack (obstack.cpp). this will be more
+	  portable and should not impact performance.
+
+11/12/01 russ
+
+	* changed the meaning of the 'flags' parameter to dCollide() and
+	  related functions: now the size of the contact buffer is kept in
+	  the lower 16 bits. this change will be backward compatible.
+
+	* added dBodyGetFiniteRotationMode() and dBodyGetFiniteRotationAxis().
+
+	* added dBodyAddForceAtRelPos() function.
+
+11/11/01 russ
+
+	* added the ability to manually enable and disable bodies.
+	  see dBodyEnable(), dBodyDisable(), dBodyIsEnabled().
+
+	* fixed a potential bug: when a world is destroyed that contains
+	  joints in joint groups, those joints are marked as "deactivated" in
+	  the joint group, so when the joint group is destroyed they can be
+	  ignored.
+
+	* the test_boxstack demo has new options to enable and disable bodies.
+
+	* new configuration parameter in config.h: dEFFICIENT_SIZE.
+
+11/11/01 russ
+
+	* started the change log for ODE. changes older than today were added
+	  to this file by inspecting the CVS logs.
+
+11/05/01 russ
+
+	* added REAL() constructions for floating point numbers, to prevent
+	  many warnings when compiling under VC++.
+
+11/03/01 russ
+
+	* added geometry transform class, documented composite objects.
+
+	* added collision rule: no contacts if both geoms on the same body.
+	  this is not the best rule, may have to remove this in the future.
+
+	* new dMassAdd() function.
+
+	* capped cylinder to capped cylinder collision function.
+
+10/31/01 russ
+
+	* increase CFM in some demos to make them more robust.
+
+10/29/01 russ
+
+	* added new accessor functions.
+
+10/19/01 russ
+
+	* added the dJOINT_TWOBODIES flag to the joint, that says it can not
+	  be attached to just one body.
+
+10/12/01 russ
+
+	* fixed a collision bug in dCollide() that was causing memory
+	  corruption when multiple contacts were being returned.
+
+10/11/01 russ
+
+	* joints can now return m=0 to be "inactive". added a "null" joint
+	  to test this.
+
+10/09/01 russ
+
+	* in the LCP solver, try to fail gracefully when s <= 0.
+
+	* dAABBTestFn() API change.
+
+10/08/01 russ
+
+	* fixed a contact swapping bug in dCollide().
+
+10/07/01 russ
+
+	* added capped cylinder geometry object.
+
+09/30/01 russ
+
+	* the test_buggy demo now uses geometry groups.
+
+	* added a dAABBTestFn field in the geometry classes.
+
+09/29/01 russ
+
+	* added geometry groups.
+
+09/20/01 russ
+
+	* added finite rotation stuff.

Deleted: branches/0.6/README
===================================================================
--- branches/0.6/README	2006-03-30 18:23:24 UTC (rev 881)
+++ branches/0.6/README	2006-03-31 14:32:07 UTC (rev 882)
@@ -1,30 +0,0 @@
-The Open Dynamics Engine (ODE), Copyright (C) 2001-2004 Russell L. Smith.
--------------------------------------------------------------------------
-
-ODE is a free, industrial quality library for simulating articulated
-rigid body dynamics - for example ground vehicles, legged creatures,
-and moving objects in VR environments. It is fast, flexible, robust
-and platform independent, with advanced joints, contact with friction,
-and built-in collision detection.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of EITHER:
-  (1) The GNU Lesser General Public License as published by the Free
-      Software Foundation; either version 2.1 of the License, or (at
-      your option) any later version. The text of the GNU Lesser
-      General Public License is included with this library in the
-      file LICENSE.TXT.
-  (2) The BSD-style license that is included with this library in
-      the file LICENSE-BSD.TXT.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
-LICENSE.TXT and LICENSE-BSD.TXT for more details.
-
-  * Installation instructions are in the INSTALL file
-
-  * The ODE web pages are at http://ode.org/
-
-  * The ODE documentation is in the file ode/doc/ode.html, or you
-    can view it on the web at http://ode.org/

Copied: branches/0.6/README.txt (from rev 881, trunk/README.txt)
===================================================================
--- branches/0.6/README.txt	                        (rev 0)
+++ branches/0.6/README.txt	2006-03-31 14:32:07 UTC (rev 882)
@@ -0,0 +1,30 @@
+The Open Dynamics Engine (ODE), Copyright (C) 2001-2004 Russell L. Smith.
+-------------------------------------------------------------------------
+
+ODE is a free, industrial quality library for simulating articulated
+rigid body dynamics - for example ground vehicles, legged creatures,
+and moving objects in VR environments. It is fast, flexible, robust
+and platform independent, with advanced joints, contact with friction,
+and built-in collision detection.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of EITHER:
+  (1) The GNU Lesser General Public License as published by the Free
+      Software Foundation; either version 2.1 of the License, or (at
+      your option) any later version. The text of the GNU Lesser
+      General Public License is included with this library in the
+      file LICENSE.TXT.
+  (2) The BSD-style license that is included with this library in
+      the file LICENSE-BSD.TXT.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+LICENSE.TXT and LICENSE-BSD.TXT for more details.
+
+  * Installation instructions are in the INSTALL file
+
+  * The ODE web pages are at http://ode.org/
+
+  * The ODE documentation is in the file ode/doc/ode.html, or you
+    can view it on the web at http://ode.org/

Deleted: branches/0.6/lib/.cvsignore
===================================================================
--- branches/0.6/lib/.cvsignore	2006-03-30 18:23:24 UTC (rev 881)
+++ branches/0.6/lib/.cvsignore	2006-03-31 14:32:07 UTC (rev 882)
@@ -1 +0,0 @@
-a_dummy_file_to_encourage_cvs_to_make_this_directory

Copied: branches/0.6/tools/ftp_msw_script (from rev 881, trunk/tools/ftp_msw_script)
===================================================================
--- branches/0.6/tools/ftp_msw_script	                        (rev 0)
+++ branches/0.6/tools/ftp_msw_script	2006-03-31 14:32:07 UTC (rev 882)
@@ -0,0 +1,9 @@
+anonymous
+ja...@us...
+cd incoming
+bin
+prompt
+mput ode-src-*.zip
+mput ode-win32-*.zip
+quit
+

Copied: branches/0.6/tools/msw-release.bat (from rev 881, trunk/tools/msw-release.bat)
===================================================================
--- branches/0.6/tools/msw-release.bat	                        (rev 0)
+++ branches/0.6/tools/msw-release.bat	2006-03-31 14:32:07 UTC (rev 882)
@@ -0,0 +1,117 @@
+@echo off
+rem ***********************************************************
+rem * ODE Windows Release Script
+rem * Originally written by Jason Perkins (st...@gm...)
+rem *
+rem * Prerequisites:
+rem *  Command-line svn installed on path
+rem *  Command-line zip installed on path
+rem *  Run within Visual Studio command prompt
+rem ***********************************************************
+
+rem * Check arguments
+if "%1"=="" goto show_usage
+if "%2"=="" goto show_usage
+
+
+rem ***********************************************************
+rem * Pre-build checklist
+rem ***********************************************************
+
+echo. 
+echo STARTING PREBUILD CHECKLIST, PRESS ^^C TO ABORT.
+echo.
+echo Is the version number "%1" correct?
+pause
+echo.
+echo Have you created a release branch named "%2" in SVN?
+pause
+echo.
+echo Have you run all of the tests?
+pause
+echo.
+echo Is the Changelog up to date?
+pause
+echo.
+echo Okay, ready to build the Windows binary package for version %1!
+pause
+
+
+rem ***********************************************************
+rem * Prepare source code
+rem ***********************************************************
+
+echo.
+echo RETRIEVING SOURCE CODE FROM REPOSITORY...
+echo.
+
+svn export https://svn.sourceforge.net/svnroot/opende/branches/%2 ode-%1
+copy ode-%1\build\config-default.h ode-%1\include\ode\config.h
+
+
+###################################################################
+# Package source code
+###################################################################
+
+echo ""
+echo "PACKAGING SOURCE CODE..."
+echo ""
+
+zip -r9 ode-src-%1.zip ode-%1/*
+
+
+rem ***********************************************************
+rem * Build the binaries
+rem ***********************************************************
+
+echo.
+echo BUILDING RELEASE BINARIES...
+echo.
+
+cd ode-%1\build\vs2003
+devenv.exe ode.sln /build DebugLib /project ode
+devenv.exe ode.sln /build DebugDLL /project ode
+devenv.exe ode.sln /build ReleaseLib /project ode
+devenv.exe ode.sln /build ReleaseDLL /project ode
+
+
+rem ***********************************************************
+rem * Package things up
+rem ***********************************************************
+
+cd ..\..\..
+rename lib\ReleaseDLL\ode.lib lib\ReleaseDLL\ode-imports.lib
+zip -r9 ode-win32-%1.zip ode-%1\*.txt ode-%1\include\ode\*.h ode-%1\lib\*
+
+
+rem ***********************************************************
+rem * Clean up
+rem ***********************************************************
+
+echo.
+echo CLEANING UP...
+echo.
+
+rmdir /s /q ode-%1
+
+
+rem ***********************************************************
+rem * Upload to SF.net
+rem ***********************************************************
+
+echo.
+echo Ready to upload package to SourceForce, press ^^C to abort.
+pause
+ftp -s:ftp_msw_script upload.sourceforge.net
+goto done
+
+
+rem ***********************************************************
+rem * Error messages
+rem ***********************************************************
+
+:show_usage
+echo Usage: msw_release.bat version_number branch_name
+goto done
+
+:done

Copied: branches/0.6/tools/posix-release.sh (from rev 881, trunk/tools/posix-release.sh)
===================================================================
--- branches/0.6/tools/posix-release.sh	                        (rev 0)
+++ branches/0.6/tools/posix-release.sh	2006-03-31 14:32:07 UTC (rev 882)
@@ -0,0 +1,51 @@
+#!/bin/sh
+###################################################################
+# ODE Windows Release Script
+# Originally written by Jason Perkins (st...@gm...)
+#
+# Prerequisites:
+#  svn, zip, and C++ build tools
+###################################################################
+
+# Check arguments
+if [ $# -ne 2 ]; then
+  echo 1>&2 "Usage: $0 version_number branch_name"
+  exit 1
+fi
+
+
+###################################################################
+# Pre-build checklist
+###################################################################
+
+echo "" 
+echo "STARTING PREBUILD CHECKLIST, PRESS ^^C TO ABORT."
+echo ""
+echo "Is the version number '$1' correct?"
+read line
+echo ""
+echo "Have you created a release branch named '$2' in SVN?"
+read line
+echo ""
+echo "Have you run all of the tests?"
+read line
+echo ""
+echo "Is the Changelog up to date?"
+read line
+echo ""
+echo "Okay, ready to build the POSIX packages for version $1!"
+read line
+
+
+###################################################################
+# Prepare source code
+###################################################################
+
+echo ""
+echo "RETRIEVING SOURCE CODE FROM REPOSITORY..."
+echo ""
+
+svn export https://svn.sourceforge.net/svnroot/opende/branches/$2 ode-$1
+cp ode-$1/build/config-default.h ode-$1/include/ode/config.h
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [881] trunk/tools

[<jas...@us...>]

Revision: 881
Author:   jason379
Date:     2006-03-30 10:23:24 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=881&view=rev

Log Message:
-----------
Improvements to the release scripts

Modified Paths:
--------------
    trunk/tools/msw-release.bat

Added Paths:
-----------
    trunk/tools/ftp_msw_script
    trunk/tools/posix-release.sh
Added: trunk/tools/ftp_msw_script
===================================================================
--- trunk/tools/ftp_msw_script	                        (rev 0)
+++ trunk/tools/ftp_msw_script	2006-03-30 18:23:24 UTC (rev 881)
@@ -0,0 +1,9 @@
+anonymous
+ja...@us...
+cd incoming
+bin
+prompt
+mput ode-src-*.zip
+mput ode-win32-*.zip
+quit
+

Modified: trunk/tools/msw-release.bat
===================================================================
--- trunk/tools/msw-release.bat	2006-03-30 17:54:35 UTC (rev 880)
+++ trunk/tools/msw-release.bat	2006-03-30 18:23:24 UTC (rev 881)
@@ -45,10 +45,21 @@
 echo RETRIEVING SOURCE CODE FROM REPOSITORY...
 echo.
 
-rem svn co https://svn.sourceforge.net/svnroot/opende/branches/%1 ode-%1
+svn export https://svn.sourceforge.net/svnroot/opende/branches/%2 ode-%1
 copy ode-%1\build\config-default.h ode-%1\include\ode\config.h
 
 
+###################################################################
+# Package source code
+###################################################################
+
+echo ""
+echo "PACKAGING SOURCE CODE..."
+echo ""
+
+zip -r9 ode-src-%1.zip ode-%1/*
+
+
 rem ***********************************************************
 rem * Build the binaries
 rem ***********************************************************
@@ -58,10 +69,10 @@
 echo.
 
 cd ode-%1\build\vs2003
-rem devenv.exe ode.sln /build DebugLib /project ode
-rem devenv.exe ode.sln /build DebugDLL /project ode
-rem devenv.exe ode.sln /build ReleaseLib /project ode
-rem devenv.exe ode.sln /build ReleaseDLL /project ode
+devenv.exe ode.sln /build DebugLib /project ode
+devenv.exe ode.sln /build DebugDLL /project ode
+devenv.exe ode.sln /build ReleaseLib /project ode
+devenv.exe ode.sln /build ReleaseDLL /project ode
 
 
 rem ***********************************************************
@@ -70,14 +81,28 @@
 
 cd ..\..\..
 rename lib\ReleaseDLL\ode.lib lib\ReleaseDLL\ode-imports.lib
-zip -r9 ode-win32-%1.zip ode-%1\*.txt ode-%1\include\ode\*.h ode-%1\lib\* -x ode-%1\lib\.svn\*
+zip -r9 ode-win32-%1.zip ode-%1\*.txt ode-%1\include\ode\*.h ode-%1\lib\*
 
 
 rem ***********************************************************
 rem * Clean up
 rem ***********************************************************
 
+echo.
+echo CLEANING UP...
+echo.
+
 rmdir /s /q ode-%1
+
+
+rem ***********************************************************
+rem * Upload to SF.net
+rem ***********************************************************
+
+echo.
+echo Ready to upload package to SourceForce, press ^^C to abort.
+pause
+ftp -s:ftp_msw_script upload.sourceforge.net
 goto done
 
 

Added: trunk/tools/posix-release.sh
===================================================================
--- trunk/tools/posix-release.sh	                        (rev 0)
+++ trunk/tools/posix-release.sh	2006-03-30 18:23:24 UTC (rev 881)
@@ -0,0 +1,51 @@
+#!/bin/sh
+###################################################################
+# ODE Windows Release Script
+# Originally written by Jason Perkins (st...@gm...)
+#
+# Prerequisites:
+#  svn, zip, and C++ build tools
+###################################################################
+
+# Check arguments
+if [ $# -ne 2 ]; then
+  echo 1>&2 "Usage: $0 version_number branch_name"
+  exit 1
+fi
+
+
+###################################################################
+# Pre-build checklist
+###################################################################
+
+echo "" 
+echo "STARTING PREBUILD CHECKLIST, PRESS ^^C TO ABORT."
+echo ""
+echo "Is the version number '$1' correct?"
+read line
+echo ""
+echo "Have you created a release branch named '$2' in SVN?"
+read line
+echo ""
+echo "Have you run all of the tests?"
+read line
+echo ""
+echo "Is the Changelog up to date?"
+read line
+echo ""
+echo "Okay, ready to build the POSIX packages for version $1!"
+read line
+
+
+###################################################################
+# Prepare source code
+###################################################################
+
+echo ""
+echo "RETRIEVING SOURCE CODE FROM REPOSITORY..."
+echo ""
+
+svn export https://svn.sourceforge.net/svnroot/opende/branches/$2 ode-$1
+cp ode-$1/build/config-default.h ode-$1/include/ode/config.h
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [880] trunk

[<jas...@us...>]

Revision: 880
Author:   jason379
Date:     2006-03-30 09:54:35 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=880&view=rev

Log Message:
-----------
Created Windows packaging script; some minor changes to support it

Added Paths:
-----------
    trunk/CHANGELOG.txt
    trunk/README.txt
    trunk/tools/msw-release.bat

Removed Paths:
-------------
    trunk/CHANGELOG
    trunk/README
    trunk/lib/.cvsignore
Deleted: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2006-03-30 16:00:12 UTC (rev 879)
+++ trunk/CHANGELOG	2006-03-30 17:54:35 UTC (rev 880)
@@ -1,412 +0,0 @@
-ODE CHANGELOG
--------------
-
-the rules for this file:
-  * entries are sorted newest-first.
-  * summarize sets of changes - dont reproduce every CVS log comment here.
-  * don't ever delete anything.
-  * keep the format consistent (79 char width, M/D/Y date format).
-
-------------------------------------------------------------------------------
-03/20/06 jason379
-
-	* Added new autogenerated Visual Studio projects, with Premake scripts
-	
-02/04/06 gcarlton
-
-	* Added support for geom offsets.
-
-10/26/05 rodrigo
-
-	* Removed LIBTOOL from autotools since it was not really required.
-	* Added a target to build ODE as a shared library, this shared
-	  library gets build alongside the static one, no flags required.
-
-10/24/05 tfautre
-
-	(Backported patches from STABLE branch, applied by Adam)
-	
-	* dRandInt changed for a non-double all-int version.
-	* mics minor fixes and improvements.
-
-04/05/05 tfautre
-
-	* Fixed segmentation fault with OPCODE on 64 bits systems.
-
-03/31/05 tfautre
-
-	* Fixed timer.cpp compiler error on x86-64 using GCC.
-
-03/29/05 colin
-
-	* Added trimesh preprocessing to mark unneeded edges and verts.  Also
-	  added support for preprocessed info to the ccylinder-trimesh
-	  collider.
-
-12/07/04 adam
-
-        * Important AMotors bugfix
-
-09/22/04 jeff
-
-	* Assorted small bugfixes and tweaks for
-	  trimesh_{box,ccylinder,trimesh} collisions
-
-09/21/04 jeff
-
-	* added functions to joint.cpp to allow joint attachment to moving
-	  geoms.
-
-	* added malloc-based memory allocation in step.cpp & lcp.cpp (turned
-	  on with a #define switch in common.h)
-	
-05/29/04 russ
-
-	* added joint feedback to the QuickStep solver
-
-05/18/04 russ
-
-	* added warm starting to the QuickStep solver
-
-05/18/04 russ
-
-	* added the QuickStep solver
-	
-	* added contact parameter functions.
-
-05/05/04 adam
-
-        * use dRandInt instead of rand() in stepfast.
-
-04/21/04 russ
-
-	* added auto-disable support from Aras Pranckevicius (with
-	  modifications by russ). this useful feature can speed up
-	  simulation significantly in some cases.
-	
-	* various internal tidyups.
-
-04/20/04 russ
-
-	* changed the meaning of the 'index' argument to dJointGetBody():
-	  it was the only remaining API function that does not respect
-	  dJOINT_REVERSE (spotted by Matthew D. Hancher).
-	
-	* updated the C++ headers: fixed two minor bugs and added
-	  support for dQuadTreeSpace, dRay, and the dGeom::getSpace() method
-	  (from Matthew D. Hancher).
-
-04/18/04 russ
-
-	* changed the way that the dInfinity constant is implemented: now it
-	  is #defined to be one of: FLT_MAX, DBL_MAX, HUGE_VAL, HUGE_VALF, or
-	  a large numeric constant. previously it was a variable that was
-	  exported from the library. this simplifies the configuration and
-	  build process quite a bit, especially in the case of DLLs.
-	
-	* removed the old, deprecated collision system (geom.cpp,space.cpp,
-	  geom.h,space.h,odecpp_old_collision.h). the ODE_OLD_COLLISION
-	  configuration setting no longer has any meaning.
-	
-	* removed support for dGeomGroups, which have been deprecated for
-	  a while and are equivalent to 'spaces' anyway.
-
-04/13/04 russ
-
-	* bug fix in dMassSetCappedCylinder(), from Matthew D. Hancher.
-
-04/08/04 russ
-
-	* added trimesh-CCylinder capability, from Vadim Macagon
-	  <vad...@ho...>.
-
-04/04/04 adam
-
-        * yet another rewrite of triangle-box collision code, this
-        time based on code donated by Croteam, ported by as...@je...
-        and tweaked by Erwin.
-
-04/04/04 adam
-
-        * merged trimesh-trimesh collision code by
-        Jeffrey Smith <jeffreys@Softimage.com>.
-
-        * changed it to not break the trimesh interface, fix
-        some GCC compilation problems, bring it up to date with
-        ODE changes from 2003-11-15 -> 2004-04-04.
-
-        * add ability to drop meshes on meshes in test_moving_trimesh,
-        not as good as it could be but it's illustrative.
-
-01/16/04 adam
-
-	* implement a bunch of ultra-simple TriMesh functions that were
-	in the headers but not in the code -- patch by
-	Vadim Macagon <vad...@ho...>
-
-	* disable temporal coherence on trimeshes by default, since
-	it has scaleability issues that don't make it a general clear win.
-
-12/01/03 adam
-
-	* implement dxHashSpace::collide2(), not particularly efficiently.
-
-11/14/03 adam
-
-	* applied several Trimesh fixes and improvements from
-	Aras Pranckevicius <ne...@in...>
-
-10/22/03 adam
-
-	* apply Nguyen Binh's work for removing many dSetZero() calls
-	and some other extraneous initializations.
-
-07/29/03 martin
-
-	* added dJointAdd*Torque/Force().
-
-07/10/03 russ
-
-	* added the StepFast code, by David Whittaker.
-
-07/02/03 martin
-
-	* added dMassSet*Total().
-
-07/01/03 martin
-
-	* added joint limits and motors to universal joints.
-
-	* reversed the polarity of the dJOINT_REVERSE flag.
-
-06/30/03 russ
-
-	* added the TriMesh geom class and the quad tree space to the ODE
-	  core. both of these were developed by Erwin de Vries. added OPCODE
-	  to the ODE distribution, this is required by TriMesh.
-
-06/23/03 martin
-
-	* added dGeomSetQuaternion() and dGeomGetQuaternion()
-	
-	* added dJointGet*Anchor2()
-
-05/07/03 russ
-
-	* added dGeomGetSpace().
-
-02/05/03 russ
-
-	* added dMassSetCylinder().
-
-12/07/02 russ
-
-	* added dAreConnectedExcluding().
-
-11/30/02 russ
-
-	* added the ray geom class.
-
-	* added the dGeomXXXPointDepth() functions.
-
-	* added a collision test infrastructure, and some more tests.
-
-11/24/02 russ
-
-	* added support for multiple box-box contacts.
-
-11/10/02 russ
-
-	* added new collision system. select between the old/new system by
-	  setting the ODE_OLD_COLLISION variable in config/user-settings.
-
-10/28/02 russ
-
-	* fixed two problems in the LCP code to improve the reliability of
-	  the dContactApprox1 contact mode.
-
-	* added a FAQ question about rolling bodies getting stuck when they
-	  hit multiple geoms.
-
-09/08/02 russ
-
-	* added dClosestLineSegmentPoints().
-	* implemented dCollideCB().
-
-08/28/02 russ
-
-	* added dJointSetFeedback() and dJointGetFeedback().
-
-08/05/02 russ
-
-	* added dGeomTransformSetInfo() and dGeomTransformGetInfo().
-
-07/13/02 russ
-
-	* added dBodySetForce(), dBodySetTorque(), dWorldImpulseToForce(),
-	  dBodyGetPosRelPoint(), dBodyGetPosRelPoint(), dBodyVectorToWorld(),
-	  dBodyVectorFromWorld().
-
-	* added dBodyGetPointVel() (thanks to Colin Reed).
-
-	* added a new C++ interface (from Martin C. Martin, with modifications
-	  by russ). the old C++ interface is now in odecpp_old.h.
-
-06/25/02 russ
-
-	* added an additional BSD-style licensing option for ODE.
-
-06/23/02 russ
-
-	* added dCloseODE(), contributed by Nate Waddoups and David McClurg.
-
-05/16/02 russ
-
-	* added dSpaceQuery(), contributed by Nate Waddoups.
-
-04/07/02 russ
-
-	* added a section to the documentation for universal joints.
-	  this includes a picture of the joint.
-
-04/05/02 russ
-
-	* added a universal joint class (generously contributed by
-	  Martin C. Martin). it doesn't (yet) have a motor or joint limits,
-	  but it does come with tests.
-
-03/11/02 russ
-
-	* makefile changes to accomodate OSs with command line length
-	  limitations (thanks to Norman Lin).
-
-01/06/02 russ
-
-	* added the dBodySetGravityMode() and dBodyGetGravityMode()
-	  functions, which change the dxBodyNoGravity body flag.
-
-	* added support for building a DLL with MSVC - there is now a
-	  msvc-dll target. thanks to Norman Lin for doing this.
-
-12/28/01 russ
-
-	* added the dParamCFM joint parameter.
-
-12/24/01 russ
-
-	* reworked the build system to make it more cross-platform.
-	  there is now a single top-level makefile and a configurator.c
-	  program. see the INSTALL file for details.
-
-12/04/01 russ
-
-	* the "angular motor" joint has been completed, and a new section
-	  has been added to the documentation.
-
-11/26/01 russ
-
-	* added a new joint type: "angular motor". using this joint is a good
-	  way to get ball-joint motors and limits. this is work in progress -
-	  it has not been fully implemented or tested yet.
-
-11/22/01 russ
-
-	* replaced the mmap()-based joint group stack (stack.cpp) with a
-	  malloc()-based arena stack (obstack.cpp). this will be more
-	  portable and should not impact performance.
-
-11/12/01 russ
-
-	* changed the meaning of the 'flags' parameter to dCollide() and
-	  related functions: now the size of the contact buffer is kept in
-	  the lower 16 bits. this change will be backward compatible.
-
-	* added dBodyGetFiniteRotationMode() and dBodyGetFiniteRotationAxis().
-
-	* added dBodyAddForceAtRelPos() function.
-
-11/11/01 russ
-
-	* added the ability to manually enable and disable bodies.
-	  see dBodyEnable(), dBodyDisable(), dBodyIsEnabled().
-
-	* fixed a potential bug: when a world is destroyed that contains
-	  joints in joint groups, those joints are marked as "deactivated" in
-	  the joint group, so when the joint group is destroyed they can be
-	  ignored.
-
-	* the test_boxstack demo has new options to enable and disable bodies.
-
-	* new configuration parameter in config.h: dEFFICIENT_SIZE.
-
-11/11/01 russ
-
-	* started the change log for ODE. changes older than today were added
-	  to this file by inspecting the CVS logs.
-
-11/05/01 russ
-
-	* added REAL() constructions for floating point numbers, to prevent
-	  many warnings when compiling under VC++.
-
-11/03/01 russ
-
-	* added geometry transform class, documented composite objects.
-
-	* added collision rule: no contacts if both geoms on the same body.
-	  this is not the best rule, may have to remove this in the future.
-
-	* new dMassAdd() function.
-
-	* capped cylinder to capped cylinder collision function.
-
-10/31/01 russ
-
-	* increase CFM in some demos to make them more robust.
-
-10/29/01 russ
-
-	* added new accessor functions.
-
-10/19/01 russ
-
-	* added the dJOINT_TWOBODIES flag to the joint, that says it can not
-	  be attached to just one body.
-
-10/12/01 russ
-
-	* fixed a collision bug in dCollide() that was causing memory
-	  corruption when multiple contacts were being returned.
-
-10/11/01 russ
-
-	* joints can now return m=0 to be "inactive". added a "null" joint
-	  to test this.
-
-10/09/01 russ
-
-	* in the LCP solver, try to fail gracefully when s <= 0.
-
-	* dAABBTestFn() API change.
-
-10/08/01 russ
-
-	* fixed a contact swapping bug in dCollide().
-
-10/07/01 russ
-
-	* added capped cylinder geometry object.
-
-09/30/01 russ
-
-	* the test_buggy demo now uses geometry groups.
-
-	* added a dAABBTestFn field in the geometry classes.
-
-09/29/01 russ
-
-	* added geometry groups.
-
-09/20/01 russ
-
-	* added finite rotation stuff.

Copied: trunk/CHANGELOG.txt (from rev 878, trunk/CHANGELOG)
===================================================================
--- trunk/CHANGELOG.txt	                        (rev 0)
+++ trunk/CHANGELOG.txt	2006-03-30 17:54:35 UTC (rev 880)
@@ -0,0 +1,412 @@
+ODE CHANGELOG
+-------------
+
+the rules for this file:
+  * entries are sorted newest-first.
+  * summarize sets of changes - dont reproduce every CVS log comment here.
+  * don't ever delete anything.
+  * keep the format consistent (79 char width, M/D/Y date format).
+
+------------------------------------------------------------------------------
+03/20/06 jason379
+
+	* Added new autogenerated Visual Studio projects, with Premake scripts
+	
+02/04/06 gcarlton
+
+	* Added support for geom offsets.
+
+10/26/05 rodrigo
+
+	* Removed LIBTOOL from autotools since it was not really required.
+	* Added a target to build ODE as a shared library, this shared
+	  library gets build alongside the static one, no flags required.
+
+10/24/05 tfautre
+
+	(Backported patches from STABLE branch, applied by Adam)
+	
+	* dRandInt changed for a non-double all-int version.
+	* mics minor fixes and improvements.
+
+04/05/05 tfautre
+
+	* Fixed segmentation fault with OPCODE on 64 bits systems.
+
+03/31/05 tfautre
+
+	* Fixed timer.cpp compiler error on x86-64 using GCC.
+
+03/29/05 colin
+
+	* Added trimesh preprocessing to mark unneeded edges and verts.  Also
+	  added support for preprocessed info to the ccylinder-trimesh
+	  collider.
+
+12/07/04 adam
+
+        * Important AMotors bugfix
+
+09/22/04 jeff
+
+	* Assorted small bugfixes and tweaks for
+	  trimesh_{box,ccylinder,trimesh} collisions
+
+09/21/04 jeff
+
+	* added functions to joint.cpp to allow joint attachment to moving
+	  geoms.
+
+	* added malloc-based memory allocation in step.cpp & lcp.cpp (turned
+	  on with a #define switch in common.h)
+	
+05/29/04 russ
+
+	* added joint feedback to the QuickStep solver
+
+05/18/04 russ
+
+	* added warm starting to the QuickStep solver
+
+05/18/04 russ
+
+	* added the QuickStep solver
+	
+	* added contact parameter functions.
+
+05/05/04 adam
+
+        * use dRandInt instead of rand() in stepfast.
+
+04/21/04 russ
+
+	* added auto-disable support from Aras Pranckevicius (with
+	  modifications by russ). this useful feature can speed up
+	  simulation significantly in some cases.
+	
+	* various internal tidyups.
+
+04/20/04 russ
+
+	* changed the meaning of the 'index' argument to dJointGetBody():
+	  it was the only remaining API function that does not respect
+	  dJOINT_REVERSE (spotted by Matthew D. Hancher).
+	
+	* updated the C++ headers: fixed two minor bugs and added
+	  support for dQuadTreeSpace, dRay, and the dGeom::getSpace() method
+	  (from Matthew D. Hancher).
+
+04/18/04 russ
+
+	* changed the way that the dInfinity constant is implemented: now it
+	  is #defined to be one of: FLT_MAX, DBL_MAX, HUGE_VAL, HUGE_VALF, or
+	  a large numeric constant. previously it was a variable that was
+	  exported from the library. this simplifies the configuration and
+	  build process quite a bit, especially in the case of DLLs.
+	
+	* removed the old, deprecated collision system (geom.cpp,space.cpp,
+	  geom.h,space.h,odecpp_old_collision.h). the ODE_OLD_COLLISION
+	  configuration setting no longer has any meaning.
+	
+	* removed support for dGeomGroups, which have been deprecated for
+	  a while and are equivalent to 'spaces' anyway.
+
+04/13/04 russ
+
+	* bug fix in dMassSetCappedCylinder(), from Matthew D. Hancher.
+
+04/08/04 russ
+
+	* added trimesh-CCylinder capability, from Vadim Macagon
+	  <vad...@ho...>.
+
+04/04/04 adam
+
+        * yet another rewrite of triangle-box collision code, this
+        time based on code donated by Croteam, ported by as...@je...
+        and tweaked by Erwin.
+
+04/04/04 adam
+
+        * merged trimesh-trimesh collision code by
+        Jeffrey Smith <jeffreys@Softimage.com>.
+
+        * changed it to not break the trimesh interface, fix
+        some GCC compilation problems, bring it up to date with
+        ODE changes from 2003-11-15 -> 2004-04-04.
+
+        * add ability to drop meshes on meshes in test_moving_trimesh,
+        not as good as it could be but it's illustrative.
+
+01/16/04 adam
+
+	* implement a bunch of ultra-simple TriMesh functions that were
+	in the headers but not in the code -- patch by
+	Vadim Macagon <vad...@ho...>
+
+	* disable temporal coherence on trimeshes by default, since
+	it has scaleability issues that don't make it a general clear win.
+
+12/01/03 adam
+
+	* implement dxHashSpace::collide2(), not particularly efficiently.
+
+11/14/03 adam
+
+	* applied several Trimesh fixes and improvements from
+	Aras Pranckevicius <ne...@in...>
+
+10/22/03 adam
+
+	* apply Nguyen Binh's work for removing many dSetZero() calls
+	and some other extraneous initializations.
+
+07/29/03 martin
+
+	* added dJointAdd*Torque/Force().
+
+07/10/03 russ
+
+	* added the StepFast code, by David Whittaker.
+
+07/02/03 martin
+
+	* added dMassSet*Total().
+
+07/01/03 martin
+
+	* added joint limits and motors to universal joints.
+
+	* reversed the polarity of the dJOINT_REVERSE flag.
+
+06/30/03 russ
+
+	* added the TriMesh geom class and the quad tree space to the ODE
+	  core. both of these were developed by Erwin de Vries. added OPCODE
+	  to the ODE distribution, this is required by TriMesh.
+
+06/23/03 martin
+
+	* added dGeomSetQuaternion() and dGeomGetQuaternion()
+	
+	* added dJointGet*Anchor2()
+
+05/07/03 russ
+
+	* added dGeomGetSpace().
+
+02/05/03 russ
+
+	* added dMassSetCylinder().
+
+12/07/02 russ
+
+	* added dAreConnectedExcluding().
+
+11/30/02 russ
+
+	* added the ray geom class.
+
+	* added the dGeomXXXPointDepth() functions.
+
+	* added a collision test infrastructure, and some more tests.
+
+11/24/02 russ
+
+	* added support for multiple box-box contacts.
+
+11/10/02 russ
+
+	* added new collision system. select between the old/new system by
+	  setting the ODE_OLD_COLLISION variable in config/user-settings.
+
+10/28/02 russ
+
+	* fixed two problems in the LCP code to improve the reliability of
+	  the dContactApprox1 contact mode.
+
+	* added a FAQ question about rolling bodies getting stuck when they
+	  hit multiple geoms.
+
+09/08/02 russ
+
+	* added dClosestLineSegmentPoints().
+	* implemented dCollideCB().
+
+08/28/02 russ
+
+	* added dJointSetFeedback() and dJointGetFeedback().
+
+08/05/02 russ
+
+	* added dGeomTransformSetInfo() and dGeomTransformGetInfo().
+
+07/13/02 russ
+
+	* added dBodySetForce(), dBodySetTorque(), dWorldImpulseToForce(),
+	  dBodyGetPosRelPoint(), dBodyGetPosRelPoint(), dBodyVectorToWorld(),
+	  dBodyVectorFromWorld().
+
+	* added dBodyGetPointVel() (thanks to Colin Reed).
+
+	* added a new C++ interface (from Martin C. Martin, with modifications
+	  by russ). the old C++ interface is now in odecpp_old.h.
+
+06/25/02 russ
+
+	* added an additional BSD-style licensing option for ODE.
+
+06/23/02 russ
+
+	* added dCloseODE(), contributed by Nate Waddoups and David McClurg.
+
+05/16/02 russ
+
+	* added dSpaceQuery(), contributed by Nate Waddoups.
+
+04/07/02 russ
+
+	* added a section to the documentation for universal joints.
+	  this includes a picture of the joint.
+
+04/05/02 russ
+
+	* added a universal joint class (generously contributed by
+	  Martin C. Martin). it doesn't (yet) have a motor or joint limits,
+	  but it does come with tests.
+
+03/11/02 russ
+
+	* makefile changes to accomodate OSs with command line length
+	  limitations (thanks to Norman Lin).
+
+01/06/02 russ
+
+	* added the dBodySetGravityMode() and dBodyGetGravityMode()
+	  functions, which change the dxBodyNoGravity body flag.
+
+	* added support for building a DLL with MSVC - there is now a
+	  msvc-dll target. thanks to Norman Lin for doing this.
+
+12/28/01 russ
+
+	* added the dParamCFM joint parameter.
+
+12/24/01 russ
+
+	* reworked the build system to make it more cross-platform.
+	  there is now a single top-level makefile and a configurator.c
+	  program. see the INSTALL file for details.
+
+12/04/01 russ
+
+	* the "angular motor" joint has been completed, and a new section
+	  has been added to the documentation.
+
+11/26/01 russ
+
+	* added a new joint type: "angular motor". using this joint is a good
+	  way to get ball-joint motors and limits. this is work in progress -
+	  it has not been fully implemented or tested yet.
+
+11/22/01 russ
+
+	* replaced the mmap()-based joint group stack (stack.cpp) with a
+	  malloc()-based arena stack (obstack.cpp). this will be more
+	  portable and should not impact performance.
+
+11/12/01 russ
+
+	* changed the meaning of the 'flags' parameter to dCollide() and
+	  related functions: now the size of the contact buffer is kept in
+	  the lower 16 bits. this change will be backward compatible.
+
+	* added dBodyGetFiniteRotationMode() and dBodyGetFiniteRotationAxis().
+
+	* added dBodyAddForceAtRelPos() function.
+
+11/11/01 russ
+
+	* added the ability to manually enable and disable bodies.
+	  see dBodyEnable(), dBodyDisable(), dBodyIsEnabled().
+
+	* fixed a potential bug: when a world is destroyed that contains
+	  joints in joint groups, those joints are marked as "deactivated" in
+	  the joint group, so when the joint group is destroyed they can be
+	  ignored.
+
+	* the test_boxstack demo has new options to enable and disable bodies.
+
+	* new configuration parameter in config.h: dEFFICIENT_SIZE.
+
+11/11/01 russ
+
+	* started the change log for ODE. changes older than today were added
+	  to this file by inspecting the CVS logs.
+
+11/05/01 russ
+
+	* added REAL() constructions for floating point numbers, to prevent
+	  many warnings when compiling under VC++.
+
+11/03/01 russ
+
+	* added geometry transform class, documented composite objects.
+
+	* added collision rule: no contacts if both geoms on the same body.
+	  this is not the best rule, may have to remove this in the future.
+
+	* new dMassAdd() function.
+
+	* capped cylinder to capped cylinder collision function.
+
+10/31/01 russ
+
+	* increase CFM in some demos to make them more robust.
+
+10/29/01 russ
+
+	* added new accessor functions.
+
+10/19/01 russ
+
+	* added the dJOINT_TWOBODIES flag to the joint, that says it can not
+	  be attached to just one body.
+
+10/12/01 russ
+
+	* fixed a collision bug in dCollide() that was causing memory
+	  corruption when multiple contacts were being returned.
+
+10/11/01 russ
+
+	* joints can now return m=0 to be "inactive". added a "null" joint
+	  to test this.
+
+10/09/01 russ
+
+	* in the LCP solver, try to fail gracefully when s <= 0.
+
+	* dAABBTestFn() API change.
+
+10/08/01 russ
+
+	* fixed a contact swapping bug in dCollide().
+
+10/07/01 russ
+
+	* added capped cylinder geometry object.
+
+09/30/01 russ
+
+	* the test_buggy demo now uses geometry groups.
+
+	* added a dAABBTestFn field in the geometry classes.
+
+09/29/01 russ
+
+	* added geometry groups.
+
+09/20/01 russ
+
+	* added finite rotation stuff.

Deleted: trunk/README
===================================================================
--- trunk/README	2006-03-30 16:00:12 UTC (rev 879)
+++ trunk/README	2006-03-30 17:54:35 UTC (rev 880)
@@ -1,30 +0,0 @@
-The Open Dynamics Engine (ODE), Copyright (C) 2001-2004 Russell L. Smith.
--------------------------------------------------------------------------
-
-ODE is a free, industrial quality library for simulating articulated
-rigid body dynamics - for example ground vehicles, legged creatures,
-and moving objects in VR environments. It is fast, flexible, robust
-and platform independent, with advanced joints, contact with friction,
-and built-in collision detection.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of EITHER:
-  (1) The GNU Lesser General Public License as published by the Free
-      Software Foundation; either version 2.1 of the License, or (at
-      your option) any later version. The text of the GNU Lesser
-      General Public License is included with this library in the
-      file LICENSE.TXT.
-  (2) The BSD-style license that is included with this library in
-      the file LICENSE-BSD.TXT.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
-LICENSE.TXT and LICENSE-BSD.TXT for more details.
-
-  * Installation instructions are in the INSTALL file
-
-  * The ODE web pages are at http://ode.org/
-
-  * The ODE documentation is in the file ode/doc/ode.html, or you
-    can view it on the web at http://ode.org/

Copied: trunk/README.txt (from rev 878, trunk/README)
===================================================================
--- trunk/README.txt	                        (rev 0)
+++ trunk/README.txt	2006-03-30 17:54:35 UTC (rev 880)
@@ -0,0 +1,30 @@
+The Open Dynamics Engine (ODE), Copyright (C) 2001-2004 Russell L. Smith.
+-------------------------------------------------------------------------
+
+ODE is a free, industrial quality library for simulating articulated
+rigid body dynamics - for example ground vehicles, legged creatures,
+and moving objects in VR environments. It is fast, flexible, robust
+and platform independent, with advanced joints, contact with friction,
+and built-in collision detection.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of EITHER:
+  (1) The GNU Lesser General Public License as published by the Free
+      Software Foundation; either version 2.1 of the License, or (at
+      your option) any later version. The text of the GNU Lesser
+      General Public License is included with this library in the
+      file LICENSE.TXT.
+  (2) The BSD-style license that is included with this library in
+      the file LICENSE-BSD.TXT.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+LICENSE.TXT and LICENSE-BSD.TXT for more details.
+
+  * Installation instructions are in the INSTALL file
+
+  * The ODE web pages are at http://ode.org/
+
+  * The ODE documentation is in the file ode/doc/ode.html, or you
+    can view it on the web at http://ode.org/

Deleted: trunk/lib/.cvsignore
===================================================================
--- trunk/lib/.cvsignore	2006-03-30 16:00:12 UTC (rev 879)
+++ trunk/lib/.cvsignore	2006-03-30 17:54:35 UTC (rev 880)
@@ -1 +0,0 @@
-a_dummy_file_to_encourage_cvs_to_make_this_directory

Added: trunk/tools/msw-release.bat
===================================================================
--- trunk/tools/msw-release.bat	                        (rev 0)
+++ trunk/tools/msw-release.bat	2006-03-30 17:54:35 UTC (rev 880)
@@ -0,0 +1,92 @@
+@echo off
+rem ***********************************************************
+rem * ODE Windows Release Script
+rem * Originally written by Jason Perkins (st...@gm...)
+rem *
+rem * Prerequisites:
+rem *  Command-line svn installed on path
+rem *  Command-line zip installed on path
+rem *  Run within Visual Studio command prompt
+rem ***********************************************************
+
+rem * Check arguments
+if "%1"=="" goto show_usage
+if "%2"=="" goto show_usage
+
+
+rem ***********************************************************
+rem * Pre-build checklist
+rem ***********************************************************
+
+echo. 
+echo STARTING PREBUILD CHECKLIST, PRESS ^^C TO ABORT.
+echo.
+echo Is the version number "%1" correct?
+pause
+echo.
+echo Have you created a release branch named "%2" in SVN?
+pause
+echo.
+echo Have you run all of the tests?
+pause
+echo.
+echo Is the Changelog up to date?
+pause
+echo.
+echo Okay, ready to build the Windows binary package for version %1!
+pause
+
+
+rem ***********************************************************
+rem * Prepare source code
+rem ***********************************************************
+
+echo.
+echo RETRIEVING SOURCE CODE FROM REPOSITORY...
+echo.
+
+rem svn co https://svn.sourceforge.net/svnroot/opende/branches/%1 ode-%1
+copy ode-%1\build\config-default.h ode-%1\include\ode\config.h
+
+
+rem ***********************************************************
+rem * Build the binaries
+rem ***********************************************************
+
+echo.
+echo BUILDING RELEASE BINARIES...
+echo.
+
+cd ode-%1\build\vs2003
+rem devenv.exe ode.sln /build DebugLib /project ode
+rem devenv.exe ode.sln /build DebugDLL /project ode
+rem devenv.exe ode.sln /build ReleaseLib /project ode
+rem devenv.exe ode.sln /build ReleaseDLL /project ode
+
+
+rem ***********************************************************
+rem * Package things up
+rem ***********************************************************
+
+cd ..\..\..
+rename lib\ReleaseDLL\ode.lib lib\ReleaseDLL\ode-imports.lib
+zip -r9 ode-win32-%1.zip ode-%1\*.txt ode-%1\include\ode\*.h ode-%1\lib\* -x ode-%1\lib\.svn\*
+
+
+rem ***********************************************************
+rem * Clean up
+rem ***********************************************************
+
+rmdir /s /q ode-%1
+goto done
+
+
+rem ***********************************************************
+rem * Error messages
+rem ***********************************************************
+
+:show_usage
+echo Usage: msw_release.bat version_number branch_name
+goto done
+
+:done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [879] branches/0.6/

[<jas...@us...>]

Revision: 879
Author:   jason379
Date:     2006-03-30 08:00:12 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=879&view=rev

Log Message:
-----------
Created branch for 0.6 release

Added Paths:
-----------
    branches/0.6/
Copied: branches/0.6 (from rev 878, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [878] trunk/build

[<jas...@us...>]

Revision: 878
Author:   jason379
Date:     2006-03-28 18:49:39 -0800 (Tue, 28 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=878&view=rev

Log Message:
-----------
Fixed (sort of) the VC6 project files

Modified Paths:
--------------
    trunk/build/premake.lua
    trunk/build/vs6/drawstuff.dsp
    trunk/build/vs6/ode.dsp
    trunk/build/vs6/test_I.dsp
    trunk/build/vs6/test_boxstack.dsp
    trunk/build/vs6/test_buggy.dsp
    trunk/build/vs6/test_chain1.dsp
    trunk/build/vs6/test_chain2.dsp
    trunk/build/vs6/test_collision.dsp
    trunk/build/vs6/test_crash.dsp
    trunk/build/vs6/test_cyl.dsp
    trunk/build/vs6/test_friction.dsp
    trunk/build/vs6/test_hinge.dsp
    trunk/build/vs6/test_joints.dsp
    trunk/build/vs6/test_moving_trimesh.dsp
    trunk/build/vs6/test_ode.dsp
    trunk/build/vs6/test_slider.dsp
    trunk/build/vs6/test_space.dsp
    trunk/build/vs6/test_space_stress.dsp
    trunk/build/vs6/test_step.dsp
    trunk/build/vs6/test_trimesh.dsp
    trunk/build/vs6/tests.dsp
Modified: trunk/build/premake.lua
===================================================================
--- trunk/build/premake.lua	2006-03-28 20:25:25 UTC (rev 877)
+++ trunk/build/premake.lua	2006-03-29 02:49:39 UTC (rev 878)
@@ -8,7 +8,7 @@
 -- own Premake-enabled project.
 
   if (options["target"] == "vs6" and not options["enable-static-only"]) then
-    options["enabled-shared-only"] = 1
+    options["enable-shared-only"] = 1
   end
   
   if (not options["enable-shared-only"] and not options["enable-static-only"]) then

Modified: trunk/build/vs6/drawstuff.dsp
===================================================================
--- trunk/build/vs6/drawstuff.dsp	2006-03-28 20:25:25 UTC (rev 877)
+++ trunk/build/vs6/drawstuff.dsp	2006-03-29 02:49:39 UTC (rev 878)
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=drawstuff - Win32 DebugDLL
+CFG=drawstuff - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,12 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "drawstuff.mak" CFG="drawstuff - Win32 DebugDLL"
+!MESSAGE NMAKE /f "drawstuff.mak" CFG="drawstuff - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "drawstuff - Win32 ReleaseLib" (based on "Win32 (x86) Static Library")
-!MESSAGE "drawstuff - Win32 DebugLib" (based on "Win32 (x86) Static Library")
-!MESSAGE "drawstuff - Win32 ReleaseDLL" (based on "Win32 (x86) Static Library")
-!MESSAGE "drawstuff - Win32 DebugDLL" (based on "Win32 (x86) Static Library")
+!MESSAGE "drawstuff - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "drawstuff - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -30,22 +28,22 @@
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "drawstuff - Win32 ReleaseLib"
+!IF  "$(CFG)" == "drawstuff - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseLib"
-# PROP BASE Intermediate_Dir "obj/ReleaseLib"
+# PROP BASE Output_Dir ".."
+# PROP BASE Intermediate_Dir "obj/Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseLib"
-# PROP Intermediate_Dir "obj/ReleaseLib"
+# PROP Output_Dir ".."
+# PROP Intermediate_Dir "obj/Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -53,17 +51,17 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "drawstuff - Win32 DebugLib"
+!ELSEIF  "$(CFG)" == "drawstuff - Win32 Debug"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugLib"
-# PROP BASE Intermediate_Dir "obj/DebugLib"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../../lib/debug"
+# PROP BASE Intermediate_Dir "obj/Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugLib"
-# PROP Intermediate_Dir "obj/DebugLib"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../lib/debug"
+# PROP Intermediate_Dir "obj/Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
@@ -76,60 +74,12 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "drawstuff - Win32 ReleaseDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseDLL"
-# PROP BASE Intermediate_Dir "obj/ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseDLL"
-# PROP Intermediate_Dir "obj/ReleaseDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "drawstuff - Win32 DebugDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugDLL"
-# PROP BASE Intermediate_Dir "obj/DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugDLL"
-# PROP Intermediate_Dir "obj/DebugDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
 !ENDIF
 
 # Begin Target
 
-# Name "drawstuff - Win32 ReleaseLib"
-# Name "drawstuff - Win32 DebugLib"
-# Name "drawstuff - Win32 ReleaseDLL"
-# Name "drawstuff - Win32 DebugDLL"
+# Name "drawstuff - Win32 Release"
+# Name "drawstuff - Win32 Debug"
 # Begin Group "include"
 
 # PROP Default_Filter ""

Modified: trunk/build/vs6/ode.dsp
===================================================================
--- trunk/build/vs6/ode.dsp	2006-03-28 20:25:25 UTC (rev 877)
+++ trunk/build/vs6/ode.dsp	2006-03-29 02:49:39 UTC (rev 878)
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=ode - Win32 DebugDLL
+CFG=ode - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,12 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "ode.mak" CFG="ode - Win32 DebugDLL"
+!MESSAGE NMAKE /f "ode.mak" CFG="ode - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ode - Win32 ReleaseLib" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ode - Win32 DebugLib" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ode - Win32 ReleaseDLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ode - Win32 DebugDLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ode - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ode - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -31,91 +29,45 @@
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ode - Win32 ReleaseLib"
+!IF  "$(CFG)" == "ode - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseLib"
-# PROP BASE Intermediate_Dir "obj/ode/ReleaseLib"
+# PROP BASE Output_Dir "../../lib/release"
+# PROP BASE Intermediate_Dir "obj/ode/Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseLib"
-# PROP Intermediate_Dir "obj/ode/ReleaseLib"
+# PROP Output_Dir "../../lib/release"
+# PROP Intermediate_Dir "obj/ode/Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../OPCODE" /D "ODE_DLL" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../OPCODE" /D "ODE_DLL" /D "WIN32" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "ode - Win32 DebugLib"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugLib"
-# PROP BASE Intermediate_Dir "obj/ode/DebugLib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugLib"
-# PROP Intermediate_Dir "obj/ode/DebugLib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "ode - Win32 ReleaseDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseDLL"
-# PROP BASE Intermediate_Dir "obj/ode/ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseDLL"
-# PROP Intermediate_Dir "obj/ode/ReleaseDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_DLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_DLL" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /implib:"../../lib/ReleaseDLL/ode.lib" /out:"../../lib/ReleaseDLL/ode.dll" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
-# ADD LINK32 user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /implib:"../../lib/ReleaseDLL/ode.lib" /out:"../../lib/ReleaseDLL/ode.dll" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
+# ADD BASE LINK32 user32.lib /nologo /dll /machine:I386 /implib:"../ode.lib" /out:"../../lib/release/ode.dll" /libpath:".."
+# ADD LINK32 user32.lib /nologo /dll /machine:I386 /implib:"../ode.lib" /out:"../../lib/release/ode.dll" /libpath:".."
 
-!ELSEIF  "$(CFG)" == "ode - Win32 DebugDLL"
+!ELSEIF  "$(CFG)" == "ode - Win32 Debug"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugDLL"
-# PROP BASE Intermediate_Dir "obj/ode/DebugDLL"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../../lib/debug"
+# PROP BASE Intermediate_Dir "obj/ode/Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugDLL"
-# PROP Intermediate_Dir "obj/ode/DebugDLL"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../lib/debug"
+# PROP Intermediate_Dir "obj/ode/Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_DLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "WIN32" /D "ODE_DLL" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "ODE_DLL" /D "WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../OPCODE" /D "ODE_DLL" /D "WIN32" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -124,17 +76,15 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /implib:"../../lib/DebugDLL/ode.lib" /out:"../../lib/DebugDLL/ode.dll" /pdbtype:sept /libpath:"../../lib/DebugDLL"
-# ADD LINK32 user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /implib:"../../lib/DebugDLL/ode.lib" /out:"../../lib/DebugDLL/ode.dll" /pdbtype:sept /libpath:"../../lib/DebugDLL"
+# ADD BASE LINK32 user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /implib:"../../lib/debug/ode.lib" /out:"../../lib/debug/ode.dll" /pdbtype:sept /libpath:"../../lib/debug"
+# ADD LINK32 user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /implib:"../../lib/debug/ode.lib" /out:"../../lib/debug/ode.dll" /pdbtype:sept /libpath:"../../lib/debug"
 
 !ENDIF
 
 # Begin Target
 
-# Name "ode - Win32 ReleaseLib"
-# Name "ode - Win32 DebugLib"
-# Name "ode - Win32 ReleaseDLL"
-# Name "ode - Win32 DebugDLL"
+# Name "ode - Win32 Release"
+# Name "ode - Win32 Debug"
 # Begin Group "include"
 
 # PROP Default_Filter ""
@@ -143,87 +93,87 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=../../include/ode/collision.h
+SOURCE=../../include/ode/objects.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/collision_space.h
+SOURCE=../../include/ode/error.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/collision_trimesh.h
+SOURCE=../../include/ode/misc.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/common.h
+SOURCE=../../include/ode/contact.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/compatibility.h
+SOURCE=../../include/ode/collision.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/config.h
+SOURCE=../../include/ode/rotation.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/contact.h
+SOURCE=../../include/ode/mass.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/error.h
+SOURCE=../../include/ode/matrix.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/export-dif.h
+SOURCE=../../include/ode/collision_space.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/mass.h
+SOURCE=../../include/ode/ode.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/matrix.h
+SOURCE=../../include/ode/memory.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/memory.h
+SOURCE=../../include/ode/odecpp_old.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/misc.h
+SOURCE=../../include/ode/compatibility.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/objects.h
+SOURCE=../../include/ode/odecpp.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/ode.h
+SOURCE=../../include/ode/timer.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/odecpp.h
+SOURCE=../../include/ode/export-dif.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/odecpp_collision.h
+SOURCE=../../include/ode/odemath.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/odecpp_old.h
+SOURCE=../../include/ode/odecpp_collision.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/odemath.h
+SOURCE=../../include/ode/collision_trimesh.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/rotation.h
+SOURCE=../../include/ode/common.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../include/ode/timer.h
+SOURCE=../../include/ode/config.h
 # End Source File
 # End Group
 # End Group
@@ -235,31 +185,31 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=../../ode/src/array.h
+SOURCE=../../ode/src/collision_space_internal.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_kernel.h
+SOURCE=../../ode/src/collision_std.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_space_internal.h
+SOURCE=../../ode/src/stack.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_std.h
+SOURCE=../../ode/src/step.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_transform.h
+SOURCE=../../ode/src/util.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh_internal.h
+SOURCE=../../ode/src/array.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_util.h
+SOURCE=../../ode/src/collision_trimesh_internal.h
 # End Source File
 # Begin Source File
 
@@ -267,19 +217,23 @@
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/lcp.h
+SOURCE=../../ode/src/collision_transform.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/mat.h
+SOURCE=../../ode/src/obstack.h
 # End Source File
 # Begin Source File
 
+SOURCE=../../ode/src/collision_util.h
+# End Source File
+# Begin Source File
+
 SOURCE=../../ode/src/objects.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/obstack.h
+SOURCE=../../ode/src/collision_kernel.h
 # End Source File
 # Begin Source File
 
@@ -287,23 +241,23 @@
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/stack.h
+SOURCE=../../ode/src/testing.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/step.h
+SOURCE=../../ode/src/lcp.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/testing.h
+SOURCE=../../ode/src/mat.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/util.h
+SOURCE=../../ode/src/fastdot.c
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/fastdot.c
+SOURCE=../../ode/src/fastltsolve.c
 # End Source File
 # Begin Source File
 
@@ -315,156 +269,152 @@
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/fastltsolve.c
+SOURCE=../../ode/src/collision_trimesh_box.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/array.cpp
+SOURCE=../../ode/src/rotation.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_cylinder_box.cpp
+SOURCE=../../ode/src/collision_trimesh_distance.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_cylinder_plane.cpp
+SOURCE=../../ode/src/collision_trimesh_ray.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_cylinder_sphere.cpp
+SOURCE=../../ode/src/matrix.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_cylinder_trimesh.cpp
+SOURCE=../../ode/src/collision_space.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_kernel.cpp
+SOURCE=../../ode/src/memory.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_quadtreespace.cpp
+SOURCE=../../ode/src/quickstep.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_space.cpp
+SOURCE=../../ode/src/testing.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_std.cpp
+SOURCE=../../ode/src/lcp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_transform.cpp
+SOURCE=../../ode/src/collision_cylinder_trimesh.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh.cpp
+SOURCE=../../ode/src/timer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh_box.cpp
+SOURCE=../../ode/src/export-dif.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh_ccylinder.cpp
+SOURCE=../../ode/src/collision_trimesh_trimesh.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh_distance.cpp
+SOURCE=../../ode/src/mat.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh_ray.cpp
+SOURCE=../../ode/src/collision_trimesh_ccylinder.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh_sphere.cpp
+SOURCE=../../ode/src/collision_trimesh.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_trimesh_trimesh.cpp
+SOURCE=../../ode/src/misc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/collision_util.cpp
+SOURCE=../../ode/src/collision_quadtreespace.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/error.cpp
+SOURCE=../../ode/src/collision_cylinder_plane.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/export-dif.cpp
+SOURCE=../../ode/src/mass.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/joint.cpp
+SOURCE=../../ode/src/collision_std.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/lcp.cpp
+SOURCE=../../ode/src/ode.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/mass.cpp
+SOURCE=../../ode/src/step.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/mat.cpp
+SOURCE=../../ode/src/util.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/matrix.cpp
+SOURCE=../../ode/src/array.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/memory.cpp
+SOURCE=../../ode/src/odemath.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/misc.cpp
+SOURCE=../../ode/src/joint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/obstack.cpp
+SOURCE=../../ode/src/collision_transform.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/ode.cpp
+SOURCE=../../ode/src/obstack.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/odemath.cpp
+SOURCE=../../ode/src/collision_util.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/quickstep.cpp
+SOURCE=../../ode/src/error.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/rotation.cpp
+SOURCE=../../ode/src/stepfast.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/step.cpp
+SOURCE=../../ode/src/collision_cylinder_sphere.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/stepfast.cpp
+SOURCE=../../ode/src/collision_kernel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/testing.cpp
+SOURCE=../../ode/src/collision_trimesh_sphere.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../ode/src/timer.cpp
+SOURCE=../../ode/src/collision_cylinder_box.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=../../ode/src/util.cpp
-# End Source File
 # End Group
 # End Group
 # Begin Group "OPCODE"
@@ -475,91 +425,91 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceAABB.h
+SOURCE=../../OPCODE/Ice/IceMemoryMacros.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceAxes.h
+SOURCE=../../OPCODE/Ice/IcePairs.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceBoundingSphere.h
+SOURCE=../../OPCODE/Ice/IceRandom.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceContainer.h
+SOURCE=../../OPCODE/Ice/IceRevisitedRadix.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceFPU.h
+SOURCE=../../OPCODE/Ice/IcePreprocessor.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceHPoint.h
+SOURCE=../../OPCODE/Ice/IcePoint.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceIndexedTriangle.h
+SOURCE=../../OPCODE/Ice/IceFPU.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceLSS.h
+SOURCE=../../OPCODE/Ice/IceTriList.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceMatrix3x3.h
+SOURCE=../../OPCODE/Ice/IcePlane.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceMatrix4x4.h
+SOURCE=../../OPCODE/Ice/IceAxes.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceMemoryMacros.h
+SOURCE=../../OPCODE/Ice/IceMatrix3x3.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceOBB.h
+SOURCE=../../OPCODE/Ice/IceMatrix4x4.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IcePairs.h
+SOURCE=../../OPCODE/Ice/IceTriangle.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IcePlane.h
+SOURCE=../../OPCODE/Ice/IceBoundingSphere.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IcePoint.h
+SOURCE=../../OPCODE/Ice/IceContainer.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IcePreprocessor.h
+SOURCE=../../OPCODE/Ice/IceAABB.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceRandom.h
+SOURCE=../../OPCODE/Ice/IceRay.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceRay.h
+SOURCE=../../OPCODE/Ice/IceUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceRevisitedRadix.h
+SOURCE=../../OPCODE/Ice/IceHPoint.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceSegment.h
+SOURCE=../../OPCODE/Ice/IceLSS.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceTriangle.h
+SOURCE=../../OPCODE/Ice/IceOBB.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceTriList.h
+SOURCE=../../OPCODE/Ice/IceSegment.h
 # End Source File
 # Begin Source File
 
@@ -567,31 +517,31 @@
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceUtils.h
+SOURCE=../../OPCODE/Ice/IceIndexedTriangle.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceAABB.cpp
+SOURCE=../../OPCODE/Ice/IceContainer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceContainer.cpp
+SOURCE=../../OPCODE/Ice/IceAABB.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceHPoint.cpp
+SOURCE=../../OPCODE/Ice/IceRay.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceIndexedTriangle.cpp
+SOURCE=../../OPCODE/Ice/IceUtils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceMatrix3x3.cpp
+SOURCE=../../OPCODE/Ice/IceHPoint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceMatrix4x4.cpp
+SOURCE=../../OPCODE/Ice/IceSegment.cpp
 # End Source File
 # Begin Source File
 
@@ -599,80 +549,80 @@
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IcePlane.cpp
+SOURCE=../../OPCODE/Ice/IceIndexedTriangle.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IcePoint.cpp
+SOURCE=../../OPCODE/Ice/IceRandom.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceRandom.cpp
+SOURCE=../../OPCODE/Ice/IceRevisitedRadix.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceRay.cpp
+SOURCE=../../OPCODE/Ice/IcePoint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceRevisitedRadix.cpp
+SOURCE=../../OPCODE/Ice/IcePlane.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceSegment.cpp
+SOURCE=../../OPCODE/Ice/IceMatrix3x3.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceTriangle.cpp
+SOURCE=../../OPCODE/Ice/IceMatrix4x4.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Ice/IceUtils.cpp
+SOURCE=../../OPCODE/Ice/IceTriangle.cpp
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=../../OPCODE/Opcode.h
+SOURCE=../../OPCODE/OPC_PlanesTriOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_AABBCollider.h
+SOURCE=../../OPCODE/OPC_RayAABBOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_AABBTree.h
+SOURCE=../../OPCODE/OPC_LSSAABBOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_BaseModel.h
+SOURCE=../../OPCODE/OPC_PlanesCollider.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_BoxBoxOverlap.h
+SOURCE=../../OPCODE/OPC_Settings.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_BoxPruning.h
+SOURCE=../../OPCODE/OPC_TriBoxOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Collider.h
+SOURCE=../../OPCODE/OPC_AABBCollider.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Common.h
+SOURCE=../../OPCODE/OPC_RayTriOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_HybridModel.h
+SOURCE=../../OPCODE/OPC_LSSTriOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_IceHook.h
+SOURCE=../../OPCODE/OPC_RayCollider.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_LSSAABBOverlap.h
+SOURCE=../../OPCODE/OPC_TreeCollider.h
 # End Source File
 # Begin Source File
 
@@ -680,183 +630,183 @@
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_LSSTriOverlap.h
+SOURCE=../../OPCODE/OPC_OBBCollider.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_MeshInterface.h
+SOURCE=../../OPCODE/OPC_PlanesAABBOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Model.h
+SOURCE=../../OPCODE/OPC_IceHook.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_OBBCollider.h
+SOURCE=../../OPCODE/OPC_Common.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_OptimizedTree.h
+SOURCE=../../OPCODE/Stdafx.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Picking.h
+SOURCE=../../OPCODE/OPC_TreeBuilders.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_PlanesAABBOverlap.h
+SOURCE=../../OPCODE/OPC_BoxBoxOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_PlanesCollider.h
+SOURCE=../../OPCODE/OPC_BaseModel.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_PlanesTriOverlap.h
+SOURCE=../../OPCODE/OPC_BoxPruning.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_RayAABBOverlap.h
+SOURCE=../../OPCODE/OPC_Collider.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_RayCollider.h
+SOURCE=../../OPCODE/OPC_SphereTriOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_RayTriOverlap.h
+SOURCE=../../OPCODE/OPC_Model.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Settings.h
+SOURCE=../../OPCODE/OPC_HybridModel.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_SphereAABBOverlap.h
+SOURCE=../../OPCODE/OPC_SphereCollider.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_SphereCollider.h
+SOURCE=../../OPCODE/OPC_AABBTree.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_SphereTriOverlap.h
+SOURCE=../../OPCODE/OPC_TriTriOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_SweepAndPrune.h
+SOURCE=../../OPCODE/Opcode.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_TreeBuilders.h
+SOURCE=../../OPCODE/OPC_MeshInterface.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_TreeCollider.h
+SOURCE=../../OPCODE/OPC_SweepAndPrune.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_TriBoxOverlap.h
+SOURCE=../../OPCODE/OPC_Picking.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_TriTriOverlap.h
+SOURCE=../../OPCODE/OPC_OptimizedTree.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_VolumeCollider.h
+SOURCE=../../OPCODE/OPC_SphereAABBOverlap.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Stdafx.h
+SOURCE=../../OPCODE/OPC_VolumeCollider.h
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/Opcode.cpp
+SOURCE=../../OPCODE/OPC_Collider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_AABBCollider.cpp
+SOURCE=../../OPCODE/OPC_Model.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_AABBTree.cpp
+SOURCE=../../OPCODE/OPC_HybridModel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_BaseModel.cpp
+SOURCE=../../OPCODE/OPC_SphereCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_BoxPruning.cpp
+SOURCE=../../OPCODE/OPC_AABBTree.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Collider.cpp
+SOURCE=../../OPCODE/Opcode.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Common.cpp
+SOURCE=../../OPCODE/OPC_MeshInterface.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_HybridModel.cpp
+SOURCE=../../OPCODE/OPC_SweepAndPrune.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_LSSCollider.cpp
+SOURCE=../../OPCODE/OPC_Picking.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_MeshInterface.cpp
+SOURCE=../../OPCODE/OPC_OptimizedTree.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Model.cpp
+SOURCE=../../OPCODE/OPC_VolumeCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_OBBCollider.cpp
+SOURCE=../../OPCODE/StdAfx.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_OptimizedTree.cpp
+SOURCE=../../OPCODE/OPC_PlanesCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_Picking.cpp
+SOURCE=../../OPCODE/OPC_AABBCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_PlanesCollider.cpp
+SOURCE=../../OPCODE/OPC_RayCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_RayCollider.cpp
+SOURCE=../../OPCODE/OPC_TreeCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_SphereCollider.cpp
+SOURCE=../../OPCODE/OPC_LSSCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_SweepAndPrune.cpp
+SOURCE=../../OPCODE/OPC_OBBCollider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_TreeBuilders.cpp
+SOURCE=../../OPCODE/OPC_Common.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_TreeCollider.cpp
+SOURCE=../../OPCODE/OPC_TreeBuilders.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/OPC_VolumeCollider.cpp
+SOURCE=../../OPCODE/OPC_BaseModel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../OPCODE/StdAfx.cpp
+SOURCE=../../OPCODE/OPC_BoxPruning.cpp
 # End Source File
 # End Group
 # End Target

Modified: trunk/build/vs6/test_I.dsp
===================================================================
--- trunk/build/vs6/test_I.dsp	2006-03-28 20:25:25 UTC (rev 877)
+++ trunk/build/vs6/test_I.dsp	2006-03-29 02:49:39 UTC (rev 878)
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=test_I - Win32 DebugDLL
+CFG=test_I - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,12 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "test_I.mak" CFG="test_I - Win32 DebugDLL"
+!MESSAGE NMAKE /f "test_I.mak" CFG="test_I - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "test_I - Win32 ReleaseLib" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_I - Win32 DebugLib" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_I - Win32 ReleaseDLL" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_I - Win32 DebugDLL" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_I - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_I - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -31,40 +29,40 @@
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "test_I - Win32 ReleaseLib"
+!IF  "$(CFG)" == "test_I - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseLib"
-# PROP BASE Intermediate_Dir "obj/I/ReleaseLib"
+# PROP BASE Output_Dir "../../lib/release"
+# PROP BASE Intermediate_Dir "obj/I/Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseLib"
-# PROP Intermediate_Dir "obj/I/ReleaseLib"
+# PROP Output_Dir "../../lib/release"
+# PROP Intermediate_Dir "obj/I/Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseLib/test_I.exe" /pdbtype:sept /libpath:"../../lib/ReleaseLib"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseLib/test_I.exe" /pdbtype:sept /libpath:"../../lib/ReleaseLib"
+# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /machine:I386 /out:"../../lib/release/test_I.exe" /libpath:".."
+# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /machine:I386 /out:"../../lib/release/test_I.exe" /libpath:".."
 
-!ELSEIF  "$(CFG)" == "test_I - Win32 DebugLib"
+!ELSEIF  "$(CFG)" == "test_I - Win32 Debug"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugLib"
-# PROP BASE Intermediate_Dir "obj/I/DebugLib"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../../lib/debug"
+# PROP BASE Intermediate_Dir "obj/I/Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugLib"
-# PROP Intermediate_Dir "obj/I/DebugLib"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../lib/debug"
+# PROP Intermediate_Dir "obj/I/Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
@@ -74,63 +72,15 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugLib/test_I.exe" /pdbtype:sept /libpath:"../../lib/DebugLib"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugLib/test_I.exe" /pdbtype:sept /libpath:"../../lib/DebugLib"
+# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/debug/test_I.exe" /pdbtype:sept /libpath:"../../lib/debug"
+# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/debug/test_I.exe" /pdbtype:sept /libpath:"../../lib/debug"
 
-!ELSEIF  "$(CFG)" == "test_I - Win32 ReleaseDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseDLL"
-# PROP BASE Intermediate_Dir "obj/I/ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseDLL"
-# PROP Intermediate_Dir "obj/I/ReleaseDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseDLL/test_I.exe" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseDLL/test_I.exe" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
-
-!ELSEIF  "$(CFG)" == "test_I - Win32 DebugDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugDLL"
-# PROP BASE Intermediate_Dir "obj/I/DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugDLL"
-# PROP Intermediate_Dir "obj/I/DebugDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugDLL/test_I.exe" /pdbtype:sept /libpath:"../../lib/DebugDLL"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugDLL/test_I.exe" /pdbtype:sept /libpath:"../../lib/DebugDLL"
-
 !ENDIF
 
 # Begin Target
 
-# Name "test_I - Win32 ReleaseLib"
-# Name "test_I - Win32 DebugLib"
-# Name "test_I - Win32 ReleaseDLL"
-# Name "test_I - Win32 DebugDLL"
+# Name "test_I - Win32 Release"
+# Name "test_I - Win32 Debug"
 # Begin Group "ode"
 
 # PROP Default_Filter ""

Modified: trunk/build/vs6/test_boxstack.dsp
===================================================================
--- trunk/build/vs6/test_boxstack.dsp	2006-03-28 20:25:25 UTC (rev 877)
+++ trunk/build/vs6/test_boxstack.dsp	2006-03-29 02:49:39 UTC (rev 878)
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=test_boxstack - Win32 DebugDLL
+CFG=test_boxstack - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,12 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "test_boxstack.mak" CFG="test_boxstack - Win32 DebugDLL"
+!MESSAGE NMAKE /f "test_boxstack.mak" CFG="test_boxstack - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "test_boxstack - Win32 ReleaseLib" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_boxstack - Win32 DebugLib" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_boxstack - Win32 ReleaseDLL" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_boxstack - Win32 DebugDLL" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_boxstack - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_boxstack - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -31,40 +29,40 @@
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "test_boxstack - Win32 ReleaseLib"
+!IF  "$(CFG)" == "test_boxstack - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseLib"
-# PROP BASE Intermediate_Dir "obj/boxstack/ReleaseLib"
+# PROP BASE Output_Dir "../../lib/release"
+# PROP BASE Intermediate_Dir "obj/boxstack/Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseLib"
-# PROP Intermediate_Dir "obj/boxstack/ReleaseLib"
+# PROP Output_Dir "../../lib/release"
+# PROP Intermediate_Dir "obj/boxstack/Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseLib/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/ReleaseLib"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseLib/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/ReleaseLib"
+# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /machine:I386 /out:"../../lib/release/test_boxstack.exe" /libpath:".."
+# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /machine:I386 /out:"../../lib/release/test_boxstack.exe" /libpath:".."
 
-!ELSEIF  "$(CFG)" == "test_boxstack - Win32 DebugLib"
+!ELSEIF  "$(CFG)" == "test_boxstack - Win32 Debug"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugLib"
-# PROP BASE Intermediate_Dir "obj/boxstack/DebugLib"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../../lib/debug"
+# PROP BASE Intermediate_Dir "obj/boxstack/Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugLib"
-# PROP Intermediate_Dir "obj/boxstack/DebugLib"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../lib/debug"
+# PROP Intermediate_Dir "obj/boxstack/Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
@@ -74,63 +72,15 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugLib/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/DebugLib"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugLib/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/DebugLib"
+# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/debug/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/debug"
+# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/debug/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/debug"
 
-!ELSEIF  "$(CFG)" == "test_boxstack - Win32 ReleaseDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseDLL"
-# PROP BASE Intermediate_Dir "obj/boxstack/ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseDLL"
-# PROP Intermediate_Dir "obj/boxstack/ReleaseDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseDLL/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseDLL/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
-
-!ELSEIF  "$(CFG)" == "test_boxstack - Win32 DebugDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugDLL"
-# PROP BASE Intermediate_Dir "obj/boxstack/DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugDLL"
-# PROP Intermediate_Dir "obj/boxstack/DebugDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugDLL/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/DebugDLL"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugDLL/test_boxstack.exe" /pdbtype:sept /libpath:"../../lib/DebugDLL"
-
 !ENDIF
 
 # Begin Target
 
-# Name "test_boxstack - Win32 ReleaseLib"
-# Name "test_boxstack - Win32 DebugLib"
-# Name "test_boxstack - Win32 ReleaseDLL"
-# Name "test_boxstack - Win32 DebugDLL"
+# Name "test_boxstack - Win32 Release"
+# Name "test_boxstack - Win32 Debug"
 # Begin Group "ode"
 
 # PROP Default_Filter ""

Modified: trunk/build/vs6/test_buggy.dsp
===================================================================
--- trunk/build/vs6/test_buggy.dsp	2006-03-28 20:25:25 UTC (rev 877)
+++ trunk/build/vs6/test_buggy.dsp	2006-03-29 02:49:39 UTC (rev 878)
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=test_buggy - Win32 DebugDLL
+CFG=test_buggy - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,12 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "test_buggy.mak" CFG="test_buggy - Win32 DebugDLL"
+!MESSAGE NMAKE /f "test_buggy.mak" CFG="test_buggy - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "test_buggy - Win32 ReleaseLib" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_buggy - Win32 DebugLib" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_buggy - Win32 ReleaseDLL" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_buggy - Win32 DebugDLL" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_buggy - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_buggy - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -31,40 +29,40 @@
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "test_buggy - Win32 ReleaseLib"
+!IF  "$(CFG)" == "test_buggy - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseLib"
-# PROP BASE Intermediate_Dir "obj/buggy/ReleaseLib"
+# PROP BASE Output_Dir "../../lib/release"
+# PROP BASE Intermediate_Dir "obj/buggy/Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseLib"
-# PROP Intermediate_Dir "obj/buggy/ReleaseLib"
+# PROP Output_Dir "../../lib/release"
+# PROP Intermediate_Dir "obj/buggy/Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseLib/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/ReleaseLib"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseLib/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/ReleaseLib"
+# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /machine:I386 /out:"../../lib/release/test_buggy.exe" /libpath:".."
+# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /machine:I386 /out:"../../lib/release/test_buggy.exe" /libpath:".."
 
-!ELSEIF  "$(CFG)" == "test_buggy - Win32 DebugLib"
+!ELSEIF  "$(CFG)" == "test_buggy - Win32 Debug"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugLib"
-# PROP BASE Intermediate_Dir "obj/buggy/DebugLib"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../../lib/debug"
+# PROP BASE Intermediate_Dir "obj/buggy/Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugLib"
-# PROP Intermediate_Dir "obj/buggy/DebugLib"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../lib/debug"
+# PROP Intermediate_Dir "obj/buggy/Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
@@ -74,63 +72,15 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugLib/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/DebugLib"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugLib/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/DebugLib"
+# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/debug/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/debug"
+# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/debug/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/debug"
 
-!ELSEIF  "$(CFG)" == "test_buggy - Win32 ReleaseDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/ReleaseDLL"
-# PROP BASE Intermediate_Dir "obj/buggy/ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/ReleaseDLL"
-# PROP Intermediate_Dir "obj/buggy/ReleaseDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseDLL/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/ReleaseDLL/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/ReleaseDLL"
-
-!ELSEIF  "$(CFG)" == "test_buggy - Win32 DebugDLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../../lib/DebugDLL"
-# PROP BASE Intermediate_Dir "obj/buggy/DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib/DebugDLL"
-# PROP Intermediate_Dir "obj/buggy/DebugDLL"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugDLL/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/DebugDLL"
-# ADD LINK32 user32.lib gdi32.lib opengl32.lib glu32.lib /nologo /entry:"mainCRTStartup" /subsystem:console /incremental:yes /debug /machine:I386 /out:"../../lib/DebugDLL/test_buggy.exe" /pdbtype:sept /libpath:"../../lib/DebugDLL"
-
 !ENDIF
 
 # Begin Target
 
-# Name "test_buggy - Win32 ReleaseLib"
-# Name "test_buggy - Win32 DebugLib"
-# Name "test_buggy - Win32 ReleaseDLL"
-# Name "test_buggy - Win32 DebugD...
 
[truncated message content]

[Opende-svn] SF.net SVN: opende: [877] trunk/OPCODE

[<jas...@us...>]

Revision: 877
Author:   jason379
Date:     2006-03-28 12:25:25 -0800 (Tue, 28 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=877&view=rev

Log Message:
-----------
Fixed easy Visual Studio warnings; mostly upcasts and typecasts around constants, some explicit boolean comparisions

Modified Paths:
--------------
    trunk/OPCODE/OPC_HybridModel.cpp
    trunk/OPCODE/OPC_OptimizedTree.cpp
    trunk/OPCODE/OPC_OptimizedTree.h
    trunk/drawstuff/src/windows.cpp
    trunk/include/ode/common.h
    trunk/ode/src/collision_cylinder_plane.cpp
    trunk/ode/src/collision_cylinder_trimesh.cpp
    trunk/ode/src/collision_trimesh_box.cpp
    trunk/ode/src/collision_trimesh_distance.cpp
    trunk/ode/src/collision_trimesh_internal.h
    trunk/ode/src/collision_trimesh_sphere.cpp
    trunk/ode/src/obstack.h
    trunk/ode/test/test_chain2.cpp
    trunk/ode/test/test_cyl.cpp
    trunk/ode/test/test_moving_trimesh.cpp
    trunk/ode/test/test_space.cpp
    trunk/ode/test/test_space_stress.cpp
    trunk/ode/test/test_trimesh.cpp
    trunk/ode/test/world_geom3.h
Modified: trunk/OPCODE/OPC_HybridModel.cpp
===================================================================
--- trunk/OPCODE/OPC_HybridModel.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/OPCODE/OPC_HybridModel.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -209,7 +209,7 @@
 				Data->mLeaves[Data->mNbLeaves] = *current->GetAABB();
 
 				// Setup leaf data
-				udword Index = (size_t(current->GetPrimitives()) - size_t(Data->mBase))/sizeof(udword);
+				udword Index = udword((size_t(current->GetPrimitives()) - size_t(Data->mBase)) / sizeof(udword));
 				Data->mTriangles[Data->mNbLeaves].SetData(current->GetNbPrimitives(), Index);
 
 				Data->mNbLeaves++;

Modified: trunk/OPCODE/OPC_OptimizedTree.cpp
===================================================================
--- trunk/OPCODE/OPC_OptimizedTree.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/OPCODE/OPC_OptimizedTree.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -550,7 +550,7 @@
 	if(!(Data&1))													\
 	{																\
 		/* Compute box number */									\
-		udword Nb = (Data - size_t(Nodes))/Nodes[i].GetNodeSize();	\
+		size_t Nb = (Data - size_t(Nodes))/Nodes[i].GetNodeSize();	\
 		Data = (size_t) &mNodes[Nb];								\
 	}																\
 	/* ...remapped */												\

Modified: trunk/OPCODE/OPC_OptimizedTree.h
===================================================================
--- trunk/OPCODE/OPC_OptimizedTree.h	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/OPCODE/OPC_OptimizedTree.h	2006-03-28 20:25:25 UTC (rev 877)
@@ -27,11 +27,11 @@
 		inline_								base_class() : mData(0)	{}										\
 		inline_								~base_class()			{}										\
 		/* Leaf test */																						\
-		inline_			BOOL				IsLeaf()		const	{ return mData&1;					}	\
+		inline_			BOOL				IsLeaf()		const	{ return (mData&1)!=0;					}	\
 		/* Data access */																					\
 		inline_			const base_class*	GetPos()		const	{ return (base_class*)mData;		}	\
 		inline_			const base_class*	GetNeg()		const	{ return ((base_class*)mData)+1;	}	\
-		inline_			udword				GetPrimitive()	const	{ return (mData>>1);				}	\
+		inline_			size_t				GetPrimitive()	const	{ return (mData>>1);				}	\
 		/* Stats */																							\
 		inline_			udword				GetNodeSize()	const	{ return SIZEOFOBJECT;				}	\
 																											\
@@ -45,13 +45,13 @@
 		inline_								base_class() : mPosData(0), mNegData(0)	{}						\
 		inline_								~base_class()							{}						\
 		/* Leaf tests */																					\
-		inline_			BOOL				HasPosLeaf()		const	{ return mPosData&1;			}	\
-		inline_			BOOL				HasNegLeaf()		const	{ return mNegData&1;			}	\
+		inline_			BOOL				HasPosLeaf()		const	{ return (mPosData&1)!=0;			}	\
+		inline_			BOOL				HasNegLeaf()		const	{ return (mNegData&1)!=0;			}	\
 		/* Data access */																					\
 		inline_			const base_class*	GetPos()			const	{ return (base_class*)mPosData;	}	\
 		inline_			const base_class*	GetNeg()			const	{ return (base_class*)mNegData;	}	\
-		inline_			udword				GetPosPrimitive()	const	{ return (mPosData>>1);			}	\
-		inline_			udword				GetNegPrimitive()	const	{ return (mNegData>>1);			}	\
+		inline_			size_t				GetPosPrimitive()	const	{ return (mPosData>>1);			}	\
+		inline_			size_t				GetNegPrimitive()	const	{ return (mNegData>>1);			}	\
 		/* Stats */																							\
 		inline_			udword				GetNodeSize()		const	{ return SIZEOFOBJECT;			}	\
 																											\

Modified: trunk/drawstuff/src/windows.cpp
===================================================================
--- trunk/drawstuff/src/windows.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/drawstuff/src/windows.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -188,7 +188,7 @@
 				     LPARAM lParam)
 {
   static int button=0,lastx=0,lasty=0;
-  int ctrl = wParam & MK_CONTROL;
+  int ctrl = int(wParam & MK_CONTROL);
 
   switch (msg) {
   case WM_LBUTTONDOWN:
@@ -224,7 +224,7 @@
     if (wParam >= ' ' && wParam <= 126) {
       int nexth = (keybuffer_head+1) & 15;
       if (nexth != keybuffer_tail) {
-	keybuffer[keybuffer_head] = wParam;
+	keybuffer[keybuffer_head] = int(wParam);
 	keybuffer_head = nexth;
       }
     }

Modified: trunk/include/ode/common.h
===================================================================
--- trunk/include/ode/common.h	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/include/ode/common.h	2006-03-28 20:25:25 UTC (rev 877)
@@ -130,7 +130,7 @@
 #define dFabs(x) (fabsf(x))			/* absolute value */
 #define dAtan2(y,x) (atan2f(y,x))		/* arc tangent with 2 args */
 #define dFMod(a,b) (fmodf(a,b))		/* modulo */
-#define dCopySign(a,b) (copysignf(a,b))
+#define dCopySign(a,b) ((dReal)copysignf(a,b))
 
 #elif defined(dDOUBLE)
 

Modified: trunk/ode/src/collision_cylinder_plane.cpp
===================================================================
--- trunk/ode/src/collision_cylinder_plane.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/src/collision_cylinder_plane.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -59,7 +59,7 @@
   dReal norms_dot = dDOT(nrm0,nrm1);
   if (norms_dot >= (1.0-dEpsilon))
     return false; // planes are parallel
-  dReal inv_det = 1.0 / (1.0 - norms_dot*norms_dot);
+  dReal inv_det = dReal(1.0) / (dReal(1.0) - norms_dot*norms_dot);
 
   dReal planeconstant0 = dDOT(nrm0, pos0);
   dReal planeconstant1 = dDOT(nrm1, pos1);
@@ -147,9 +147,9 @@
   dVector3 x={1,0,0};
   dVector3 y={0,1,0};
   dVector3 z={0,0,1};
-  float dotx = dFabs(dDOT(v,x));
-  float doty = dFabs(dDOT(v,y));
-  float dotz = dFabs(dDOT(v,z));
+  float dotx = (float)dFabs(dDOT(v,x));
+  float doty = (float)dFabs(dDOT(v,y));
+  float dotz = (float)dFabs(dDOT(v,z));
   if (dotx <= doty && dotx <= dotz) 
   {
     dVector3Copy(x, axis);
@@ -193,7 +193,7 @@
   dIASSERT(axislen>=0.9999);
   dIASSERT(axislen<=1.0001);
 
-  dReal hl = length/2.0;
+  dReal hl = length/dReal(2.0);
   dVector3 disc_top_pos = { cylpos[0]+axis[0]*hl, cylpos[1]+axis[1]*hl, cylpos[2]+axis[2]*hl };
   dVector3 disc_bot_pos = { cylpos[0]-axis[0]*hl, cylpos[1]-axis[1]*hl, cylpos[2]-axis[2]*hl };
   dVector3 disc_top_nrm = {  axis[0],  axis[1],  axis[2] };
@@ -314,8 +314,6 @@
 
   // Test the discs!
 
-  dVector3 closest0, closest1, diff0, diff1;
-
   dVector3 poi_top, doi_top;
   dVector3 poi_bot, doi_bot;
   dReal depth_top, depth_bot;

Modified: trunk/ode/src/collision_cylinder_trimesh.cpp
===================================================================
--- trunk/ode/src/collision_cylinder_trimesh.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/src/collision_cylinder_trimesh.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -589,7 +589,7 @@
 	// plane with edge 1
 	//dVector3 vTemp = ( cData.vNormal cross cData.vE1 );
 	dVector3Cross(cData.vNormal,cData.vE1,vPlaneNormal);
-	fTemp = dVector3Dot(cData.vE0 , vPlaneNormal) - 1e-5;
+	fTemp = dVector3Dot(cData.vE0 , vPlaneNormal) - dReal(1e-5);
 	//plPlane = Plane4f( vTemp, -(( cData.vE0 dot vTemp )-1e-5f));
 	dConstructPlane(vPlaneNormal,-fTemp,plPlane);
 	if(!dClipEdgeToPlane( vCEdgePoint0, vCEdgePoint1, plPlane )) 
@@ -941,17 +941,17 @@
 
 	Matrix3x3 obbRot;
 
-	obbRot[0][0] = cData.mCylinderRot[0];
-	obbRot[1][0] = cData.mCylinderRot[1];
-	obbRot[2][0] = cData.mCylinderRot[2];
+	obbRot[0][0] = (float)cData.mCylinderRot[0];
+	obbRot[1][0] = (float)cData.mCylinderRot[1];
+	obbRot[2][0] = (float)cData.mCylinderRot[2];
 
-	obbRot[0][1] = cData.mCylinderRot[4];
-	obbRot[1][1] = cData.mCylinderRot[5];
-	obbRot[2][1] = cData.mCylinderRot[6];
+	obbRot[0][1] = (float)cData.mCylinderRot[4];
+	obbRot[1][1] = (float)cData.mCylinderRot[5];
+	obbRot[2][1] = (float)cData.mCylinderRot[6];
 
-	obbRot[0][2] = cData.mCylinderRot[8];
-	obbRot[1][2] = cData.mCylinderRot[9];
-	obbRot[2][2] = cData.mCylinderRot[10];
+	obbRot[0][2] = (float)cData.mCylinderRot[8];
+	obbRot[1][2] = (float)cData.mCylinderRot[9];
+	obbRot[2][2] = (float)cData.mCylinderRot[10];
 
 	OBB obbCapsule(cCenter,cExtents,obbRot);
 

Modified: trunk/ode/src/collision_trimesh_box.cpp
===================================================================
--- trunk/ode/src/collision_trimesh_box.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/src/collision_trimesh_box.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -1155,21 +1155,21 @@
   Box.mCenter.z = vPosBox[2];
 
 
-  Box.mExtents.x = vBoxHalfSize[0];
-  Box.mExtents.y = vBoxHalfSize[1];
-  Box.mExtents.z = vBoxHalfSize[2];
+  Box.mExtents.x = (float)vBoxHalfSize[0];
+  Box.mExtents.y = (float)vBoxHalfSize[1];
+  Box.mExtents.z = (float)vBoxHalfSize[2];
 
-  Box.mRot.m[0][0] = mRotBox[0];
-  Box.mRot.m[1][0] = mRotBox[1];
-  Box.mRot.m[2][0] = mRotBox[2];
+  Box.mRot.m[0][0] = (float)mRotBox[0];
+  Box.mRot.m[1][0] = (float)mRotBox[1];
+  Box.mRot.m[2][0] = (float)mRotBox[2];
 
-  Box.mRot.m[0][1] = mRotBox[4];
-  Box.mRot.m[1][1] = mRotBox[5];
-  Box.mRot.m[2][1] = mRotBox[6];
+  Box.mRot.m[0][1] = (float)mRotBox[4];
+  Box.mRot.m[1][1] = (float)mRotBox[5];
+  Box.mRot.m[2][1] = (float)mRotBox[6];
 
-  Box.mRot.m[0][2] = mRotBox[8];
-  Box.mRot.m[1][2] = mRotBox[9];
-  Box.mRot.m[2][2] = mRotBox[10];
+  Box.mRot.m[0][2] = (float)mRotBox[8];
+  Box.mRot.m[1][2] = (float)mRotBox[9];
+  Box.mRot.m[2][2] = (float)mRotBox[10];
 
   Matrix4x4 amatrix;
   Matrix4x4 BoxMatrix = MakeMatrix(vPosBox, mRotBox, amatrix);

Modified: trunk/ode/src/collision_trimesh_distance.cpp
===================================================================
--- trunk/ode/src/collision_trimesh_distance.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/src/collision_trimesh_distance.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -129,7 +129,7 @@
       } 
       else
       {
-        float fInvDet = REAL(1.0)/fDet;
+        dReal fInvDet = REAL(1.0)/fDet;
         fS *= fInvDet;
         fT *= fInvDet;
         fSqrDist = fS*(fA00*fS+fA01*fT+REAL(2.0)*fB0) +
@@ -139,7 +139,7 @@
   }
   else
   {
-    float fTmp0, fTmp1, fNumer, fDenom;
+    dReal fTmp0, fTmp1, fNumer, fDenom;
 
     if ( fS < REAL(0.0) )  // region 2
     {

Modified: trunk/ode/src/collision_trimesh_internal.h
===================================================================
--- trunk/ode/src/collision_trimesh_internal.h	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/src/collision_trimesh_internal.h	2006-03-28 20:25:25 UTC (rev 877)
@@ -251,7 +251,7 @@
 // Performs a callback
 inline bool Callback(dxTriMesh* TriMesh, dxGeom* Object, int TriIndex){
 	if (TriMesh->Callback != null){
-		return TriMesh->Callback(TriMesh, Object, TriIndex);
+		return (TriMesh->Callback(TriMesh, Object, TriIndex)!=0);
 	}
 	else return true;
 }

Modified: trunk/ode/src/collision_trimesh_sphere.cpp
===================================================================
--- trunk/ode/src/collision_trimesh_sphere.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/src/collision_trimesh_sphere.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -34,7 +34,7 @@
 #define MERGECONTACTS
 
 // Ripped from Opcode 1.1.
-static bool GetContactData(const dVector3& Center, dReal Radius, const dVector3 Origin, const dVector3 Edge0, const dVector3 Edge1, dReal& Dist, float& u, float& v){
+static bool GetContactData(const dVector3& Center, dReal Radius, const dVector3 Origin, const dVector3 Edge0, const dVector3 Edge1, dReal& Dist, dReal& u, dReal& v){
 	//calculate plane of triangle
 	dVector4 Plane;
 	dCROSS(Plane, =, Edge0, Edge1);
@@ -50,7 +50,7 @@
          * to be adjusted (penetration has occured anyway).
          */
   
-	float side = dDOT(Plane,Center) - Plane[3];
+	dReal side = dDOT(Plane,Center) - Plane[3];
   
 	if(side < 0.0f) {
 		return false;
@@ -64,20 +64,20 @@
 	Diff[2] = Origin[2] - Center[2];
 	Diff[3] = Origin[3] - Center[3];
 
-	float A00 = dDOT(Edge0, Edge0);
-	float A01 = dDOT(Edge0, Edge1);
-	float A11 = dDOT(Edge1, Edge1);
+	float A00 = (float)dDOT(Edge0, Edge0);
+	float A01 = (float)dDOT(Edge0, Edge1);
+	float A11 = (float)dDOT(Edge1, Edge1);
 
-	float B0 = dDOT(Diff, Edge0);
-	float B1 = dDOT(Diff, Edge1);
+	float B0 = (float)dDOT(Diff, Edge0);
+	float B1 = (float)dDOT(Diff, Edge1);
 
-	float C = dDOT(Diff, Diff);
+	float C = (float)dDOT(Diff, Diff);
 
-	float Det = dFabs(A00 * A11 - A01 * A01);
+	float Det = (float)dFabs(A00 * A11 - A01 * A01);
 	u = A01 * B1 - A11 * B0;
 	v = A01 * B0 - A00 * B1;
 
-	float DistSq;
+	dReal DistSq;
 
 	if (u + v <= Det){
 		if(u < REAL(0.0)){
@@ -148,7 +148,7 @@
 				DistSq = FLT_MAX;
 			}
 			else{
-				float InvDet = REAL(1.0) / Det;
+				dReal InvDet = REAL(1.0) / Det;
 				u *= InvDet;
 				v *= InvDet;
 				DistSq = u * (A00 * u + A01 * v + REAL(2.0) * B0) + v * (A01 * u + A11 * v + REAL(2.0) * B1) + C;
@@ -156,7 +156,7 @@
 		}
 	}
 	else{
-		float Tmp0, Tmp1, Numer, Denom;
+		dReal Tmp0, Tmp1, Numer, Denom;
 
 		if(u < REAL(0.0)){  // region 2
 			Tmp0 = A01 + B0;
@@ -350,7 +350,7 @@
 			vv[3] = REAL(0.0);
 
 			dReal Depth;
-			float u, v;
+			dReal u, v;
 			if (!GetContactData(Position, Radius, v0, vu, vv, Depth, u, v)){
 				continue;	// Sphere doesnt hit triangle
 			}

Modified: trunk/ode/src/obstack.h
===================================================================
--- trunk/ode/src/obstack.h	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/src/obstack.h	2006-03-28 20:25:25 UTC (rev 877)
@@ -32,7 +32,7 @@
 struct dObStack : public dBase {
   struct Arena {
     Arena *next;	// next arena in linked list
-    int used;		// total number of bytes used in this arena, counting
+    size_t used;		// total number of bytes used in this arena, counting
   };			//   this header
 
   Arena *first;		// head of the arena linked list. 0 if no arenas yet
@@ -40,7 +40,7 @@
 
   // used for iterator
   Arena *current_arena;
-  int current_ofs;
+  size_t current_ofs;
 
   dObStack();
   ~dObStack();

Modified: trunk/ode/test/test_chain2.cpp
===================================================================
--- trunk/ode/test/test_chain2.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/test/test_chain2.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -144,7 +144,7 @@
     m.setBox (1,SIDE,SIDE,SIDE);
     m.adjust (MASS);
     body[i].setMass (&m);
-    body[i].setData ((void*) i);
+    body[i].setData ((void*)(size_t)i);
 
     box[i].create (space,SIDE,SIDE,SIDE);
     box[i].setBody (body[i]);

Modified: trunk/ode/test/test_cyl.cpp
===================================================================
--- trunk/ode/test/test_cyl.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/test/test_cyl.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -192,7 +192,6 @@
 
 int main (int argc, char **argv)
 {
-  int i;
   dMass m;
   dMatrix3 R;
 

Modified: trunk/ode/test/test_moving_trimesh.cpp
===================================================================
--- trunk/ode/test/test_moving_trimesh.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/test/test_moving_trimesh.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -1550,7 +1550,7 @@
       dRFromAxisAndAngle (R,0,0,1,dRandReal()*10.0-5.0);
     }
     dBodySetRotation (obj[i].body,R);
-    dBodySetData (obj[i].body,(void*) i);
+    dBodySetData (obj[i].body,(void*)(size_t)i);
 
     if (cmd == 'b') {
       dMassSetBox (&m,DENSITY,sides[0],sides[1],sides[2]);

Modified: trunk/ode/test/test_space.cpp
===================================================================
--- trunk/ode/test/test_space.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/test/test_space.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -90,7 +90,7 @@
 		      (bounds[i][0] + bounds[i][1])*0.5,
 		      (bounds[i][2] + bounds[i][3])*0.5,
 		      (bounds[i][4] + bounds[i][5])*0.5);
-    dGeomSetData (geom[i],(void*) (i));
+    dGeomSetData (geom[i],(void*)(size_t)(i));
   }
 
   // compute all intersections and put the results in "good_matrix"

Modified: trunk/ode/test/test_space_stress.cpp
===================================================================
--- trunk/ode/test/test_space_stress.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/test/test_space_stress.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -179,7 +179,7 @@
       dRFromAxisAndAngle (R,0,0,1,dRandReal()*10.0-5.0);
     }
     dBodySetRotation (obj[i].body,R);
-    dBodySetData (obj[i].body,(void*) i);
+    dBodySetData (obj[i].body,(void*)(size_t)i);
 
     if (cmd == 'b') {
       dMassSetBox (&m,DENSITY,sides[0],sides[1],sides[2]);

Modified: trunk/ode/test/test_trimesh.cpp
===================================================================
--- trunk/ode/test/test_trimesh.cpp	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/test/test_trimesh.cpp	2006-03-28 20:25:25 UTC (rev 877)
@@ -205,7 +205,7 @@
       dRFromAxisAndAngle (R,0,0,1,dRandReal()*10.0-5.0);
     }
     dBodySetRotation (obj[i].body,R);
-    dBodySetData (obj[i].body,(void*) i);
+    dBodySetData (obj[i].body,(void*)(size_t)i);
 
     if (cmd == 'b') {
       dMassSetBox (&m,DENSITY,sides[0],sides[1],sides[2]);

Modified: trunk/ode/test/world_geom3.h
===================================================================
--- trunk/ode/test/world_geom3.h	2006-03-28 19:01:33 UTC (rev 876)
+++ trunk/ode/test/world_geom3.h	2006-03-28 20:25:25 UTC (rev 877)
@@ -1,8 +1,8 @@
 // mesh for a world model, to be used with test_cyl.cpp
 
-static float world_vertices[] = {10.000000,-10.000000,1.000000,-10.000000,-10.000000,1.000000,-10.000000,-10.000000,-1.000000,-10.000000,-10.000000,-1.000000,10.000000,-10.000000,-1.000000,10.000000,-10.000000,1.000000,10.000000,10.000000,1.000000,10.000000,-10.000000,1.000000,10.000000,-10.000000,-1.000000,10.000000,-10.000000,-1.000000,10.000000,10.000000,-1.000000,10.000000,10.000000,1.000000,10.000000,10.000000,-1.000000,10.000000,-10.000000,-1.000000,-10.000000,-10.000000,-1.000000,-10.000000,-10.000000,-1.000000,-10.000000,10.000000,-1.000000,10.000000,10.000000,-1.000000,0.000000,9.000000,-0.000000,0.000000,-9.000000,0.000000,9.000000,-9.000000,0.000000,0.000000,9.000000,-0.000000,9.000000,-9.000000,0.000000,9.000000,9.000000,-0.000000,10.000000,10.000000,-1.000000,-10.000000,10.000000,-1.000000,-10.000000,10.000000,1.000000,10.000000,10.000000,-1.000000,-10.000000,10.000000,1.000000,10.000000,10.000000,1.000000,-10.000000,-10.000000,-1.000000,-10.000000,-10.000000,1.000000,-10.000000,10.000000,1.000000,-10.000000,10.000000,1.000000,-10.000000,10.000000,-1.000000,-10.000000,-10.000000,-1.000000,9.000000,-9.000000,1.000000,-9.000000,-9.000000,1.000000,10.000000,-10.000000,1.000000,-9.000000,-9.000000,1.000000,-10.000000,-10.000000,1.000000,10.000000,-10.000000,1.000000,9.000000,9.000000,1.000000,9.000000,-9.000000,1.000000,10.000000,-10.000000,1.000000,10.000000,-10.000000,1.000000,10.000000,10.000000,1.000000,9.000000,9.000000,1.000000,-9.000000,9.000000,1.000000,9.000000,9.000000,1.000000,10.000000,10.000000,1.000000,10.000000,10.000000,1.000000,-10.000000,10.000000,1.000000,-9.000000,9.000000,1.000000,-9.000000,9.000000,1.000000,-10.000000,10.000000,1.000000,-9.000000,-9.000000,1.000000,-10.000000,10.000000,1.000000,-10.000000,-10.000000,1.000000,-9.000000,-9.000000,1.000000,0.000000,-9.000000,0.000000,-9.000000,-9.000000,0.000000,-9.000000,-9.000000,1.000000,0.000000,-9.000000,0.000000,-9.000000,-9.000000,1.000000,9.000000,-9.000000,1.000000,0.000000,-9.000000,0.000000,9.000000,-9.000000,1.000000,9.000000,-9.000000,0.000000,9.000000,-9.000000,0.000000,9.000000,-9.000000,1.000000,9.000000,9.000000,1.000000,9.000000,9.000000,1.000000,9.000000,9.000000,-0.000000,9.000000,-9.000000,0.000000,0.000000,9.000000,-0.000000,9.000000,9.000000,-0.000000,9.000000,9.000000,1.000000,0.000000,9.000000,-0.000000,9.000000,9.000000,1.000000,-9.000000,9.000000,1.000000,0.000000,9.000000,-0.000000,-9.000000,9.000000,1.000000,-9.000000,9.000000,-0.000000,-9.000000,9.000000,1.000000,-9.000000,-9.000000,1.000000,-9.000000,-9.000000,0.000000,-9.000000,-9.000000,0.000000,-9.000000,9.000000,-0.000000,-9.000000,9.000000,1.000000,-2.997000,-1.748874,0.000000,-2.997000,-2.001000,0.000000,0.000000,-9.000000,0.000000,-2.997000,-1.748874,0.000000,0.000000,-9.000000,0.000000,-2.997000,1.748874,-0.000000,-2.997000,-2.001000,0.000000,-2.997000,-6.003000,0.002697,0.000000,-9.000000,0.000000,0.000000,9.000000,-0.000000,-2.997000,2.001000,-0.000000,-2.997000,1.748874,-0.000000,0.000000,9.000000,-0.000000,-2.997000,1.748874,-0.000000,0.000000,-9.000000,0.000000,-2.997000,2.001000,-0.000000,0.000000,9.000000,-0.000000,-2.997000,6.003000,0.002697,-6.003000,6.003000,0.002697,-2.997000,6.003000,0.002697,0.000000,9.000000,-0.000000,0.000000,9.000000,-0.000000,-9.000000,9.000000,-0.000000,-6.003000,6.003000,0.002697,-6.003000,1.748874,-0.000000,-9.000000,-9.000000,0.000000,-6.003000,-1.748874,0.000000,-6.003000,2.001000,-0.000000,-6.003000,6.003000,0.002697,-9.000000,9.000000,-0.000000,-9.000000,9.000000,-0.000000,-6.003000,1.748874,-0.000000,-6.003000,2.001000,-0.000000,-9.000000,9.000000,-0.000000,-9.000000,-9.000000,0.000000,-6.003000,1.748874,-0.000000,-9.000000,-9.000000,0.000000,-6.003000,-6.003000,0.002697,-6.003000,-2.001000,0.000000,-9.000000,-9.000000,0.000000,-6.003000,-2.001000,0.000000,-6.003000,-1.748874,0.000000,-6.003000,-6.003000,0.002697,-9.000000,-9.000000,0.000000,0.000000,-9.000000,0.000000,-6.003000,-6.003000,0.002697,0.000000,-9.000000,0.000000,-2.997000,-6.003000,0.002697,-2.997000,1.748874,1.237951,-2.997000,1.748874,-0.000000,-2.997000,2.001000,-0.000000,-2.997000,1.748874,1.237951,-2.997000,2.001000,-0.000000,-2.997000,2.001000,1.515748,-6.003000,-2.001000,1.515748,-6.003000,-6.003000,0.002697,-2.997000,-6.003000,0.002697,-6.003000,-2.001000,1.515748,-2.997000,-6.003000,0.002697,-2.997000,-2.001000,1.515748,-2.997000,2.001000,1.515748,-2.997000,6.003000,0.002697,-6.003000,6.003000,0.002697,-6.003000,6.003000,0.002697,-6.003000,2.001000,1.515748,-2.997000,2.001000,1.515748,-6.003000,-2.001000,0.000000,-6.003000,-6.003000,0.002697,-6.003000,-2.001000,1.515748,-6.003000,2.001000,1.515748,-6.003000,6.003000,0.002697,-6.003000,2.001000,-0.000000,-2.997000,-2.001000,1.515748,-2.997000,-6.003000,0.002697,-2.997000,-2.001000,0.000000,-2.997000,2.001000,-0.000000,-2.997000,6.003000,0.002697,-2.997000,2.001000,1.515748,-2.997000,-2.001000,1.515748,-2.997000,2.001000,1.515748,-6.003000,2.001000,1.515748,-6.003000,2.001000,1.515748,-6.003000,-2.001000,1.515748,-2.997000,-2.001000,1.515748,-2.997000,-1.748874,1.237951,-2.997000,1.748874,1.237951,-2.997000,2.001000,1.515748,-2.997000,-1.748874,1.237951,-2.997000,2.001000,1.515748,-2.997000,-2.001000,1.515748,-6.003000,-1.748874,1.237951,-6.003000,-1.748874,0.000000,-6.003000,-2.001000,0.000000,-6.003000,-1.748874,1.237951,-6.003000,-2.001000,0.000000,-6.003000,-2.001000,1.515748,-2.997000,-2.001000,1.515748,-2.997000,-2.001000,0.000000,-2.997000,-1.748874,1.237951,-2.997000,-2.001000,0.000000,-2.997000,-1.748874,0.000000,-2.997000,-1.748874,1.237951,-6.003000,1.748874,1.237951,-6.003000,2.001000,1.515748,-6.003000,2.001000,-0.000000,-6.003000,1.748874,1.237951,-6.003000,2.001000,-0.000000,-6.003000,1.748874,-0.000000,-6.003000,1.748874,1.237951,-6.003000,-1.748874,1.237951,-6.003000,-2.001000,1.515748,-6.003000,1.748874,1.237951,-6.003000,-2.001000,1.515748,-6.003000,2.001000,1.515748,-6.003000,1.748874,1.237951,-6.003000,1.748874,-0.000000,-2.997000,1.748874,1.237951,-6.003000,1.748874,-0.000000,-2.997000,1.748874,-0.000000,-2.997000,1.748874,1.237951,-6.003000,1.748874,-0.000000,-6.003000,-1.748874,0.000000,-2.997000,-1.748874,0.000000,-6.003000,1.748874,-0.000000,-2.997000,-1.748874,0.000000,-2.997000,1.748874,-0.000000,-6.003000,-1.748874,0.000000,-6.003000,-1.748874,1.237951,-2.997000,-1.748874,1.237951,-2.997000,-1.748874,1.237951,-2.997000,-1.748874,0.000000,-6.003000,-1.748874,0.000000,-6.003000,-1.748874,1.237951,-6.003000,1.748874,1.237951,-2.997000,-1.748874,1.237951,-6.003000,1.748874,1.237951,-2.997000,1.748874,1.237951,-2.997000,-1.748874,1.237951};
+static float world_vertices[] = {10.000000f,-10.000000f,1.000000f,-10.000000f,-10.000000f,1.000000f,-10.000000f,-10.000000f,-1.000000f,-10.000000f,-10.000000f,-1.000000f,10.000000f,-10.000000f,-1.000000f,10.000000f,-10.000000f,1.000000f,10.000000f,10.000000f,1.000000f,10.000000f,-10.000000f,1.000000f,10.000000f,-10.000000f,-1.000000f,10.000000f,-10.000000f,-1.000000f,10.000000f,10.000000f,-1.000000f,10.000000f,10.000000f,1.000000f,10.000000f,10.000000f,-1.000000f,10.000000f,-10.000000f,-1.000000f,-10.000000f,-10.000000f,-1.000000f,-10.000000f,-10.000000f,-1.000000f,-10.000000f,10.000000f,-1.000000f,10.000000f,10.000000f,-1.000000f,0.000000f,9.000000f,-0.000000f,0.000000f,-9.000000f,0.000000f,9.000000f,-9.000000f,0.000000f,0.000000f,9.000000f,-0.000000f,9.000000f,-9.000000f,0.000000f,9.000000f,9.000000f,-0.000000f,10.000000f,10.000000f,-1.000000f,-10.000000f,10.000000f,-1.000000f,-10.000000f,10.000000f,1.000000f,10.000000f,10.000000f,-1.000000f,-10.000000f,10.000000f,1.000000f,10.000000f,10.000000f,1.000000f,-10.000000f,-10.000000f,-1.000000f,-10.000000f,-10.000000f,1.000000f,-10.000000f,10.000000f,1.000000f,-10.000000f,10.000000f,1.000000f,-10.000000f,10.000000f,-1.000000f,-10.000000f,-10.000000f,-1.000000f,9.000000f,-9.000000f,1.000000f,-9.000000f,-9.000000f,1.000000f,10.000000f,-10.000000f,1.000000f,-9.000000f,-9.000000f,1.000000f,-10.000000f,-10.000000f,1.000000f,10.000000f,-10.000000f,1.000000f,9.000000f,9.000000f,1.000000f,9.000000f,-9.000000f,1.000000f,10.000000f,-10.000000f,1.000000f,10.000000f,-10.000000f,1.000000f,10.000000f,10.000000f,1.000000f,9.000000f,9.000000f,1.000000f,-9.000000f,9.000000f,1.000000f,9.000000f,9.000000f,1.000000f,10.000000f,10.000000f,1.000000f,10.000000f,10.000000f,1.000000f,-10.000000f,10.000000f,1.000000f,-9.000000f,9.000000f,1.000000f,-9.000000f,9.000000f,1.000000f,-10.000000f,10.000000f,1.000000f,-9.000000f,-9.000000f,1.000000f,-10.000000f,10.000000f,1.000000f,-10.000000f,-10.000000f,1.000000f,-9.000000f,-9.000000f,1.000000f,0.000000f,-9.000000f,0.000000f,-9.000000f,-9.000000f,0.000000f,-9.000000f,-9.000000f,1.000000f,0.000000f,-9.000000f,0.000000f,-9.000000f,-9.000000f,1.000000f,9.000000f,-9.000000f,1.000000f,0.000000f,-9.000000f,0.000000f,9.000000f,-9.000000f,1.000000f,9.000000f,-9.000000f,0.000000f,9.000000f,-9.000000f,0.000000f,9.000000f,-9.000000f,1.000000f,9.000000f,9.000000f,1.000000f,9.000000f,9.000000f,1.000000f,9.000000f,9.000000f,-0.000000f,9.000000f,-9.000000f,0.000000f,0.000000f,9.000000f,-0.000000f,9.000000f,9.000000f,-0.000000f,9.000000f,9.000000f,1.000000f,0.000000f,9.000000f,-0.000000f,9.000000f,9.000000f,1.000000f,-9.000000f,9.000000f,1.000000f,0.000000f,9.000000f,-0.000000f,-9.000000f,9.000000f,1.000000f,-9.000000f,9.000000f,-0.000000f,-9.000000f,9.000000f,1.000000f,-9.000000f,-9.000000f,1.000000f,-9.000000f,-9.000000f,0.000000f,-9.000000f,-9.000000f,0.000000f,-9.000000f,9.000000f,-0.000000f,-9.000000f,9.000000f,1.000000f,-2.997000f,-1.748874f,0.000000f,-2.997000f,-2.001000f,0.000000f,0.000000f,-9.000000f,0.000000f,-2.997000f,-1.748874f,0.000000f,0.000000f,-9.000000f,0.000000f,-2.997000f,1.748874f,-0.000000f,-2.997000f,-2.001000f,0.000000f,-2.997000f,-6.003000f,0.002697f,0.000000f,-9.000000f,0.000000f,0.000000f,9.000000f,-0.000000f,-2.997000f,2.001000f,-0.000000f,-2.997000f,1.748874f,-0.000000f,0.000000f,9.000000f,-0.000000f,-2.997000f,1.748874f,-0.000000f,0.000000f,-9.000000f,0.000000f,-2.997000f,2.001000f,-0.000000f,0.000000f,9.000000f,-0.000000f,-2.997000f,6.003000f,0.002697f,-6.003000f,6.003000f,0.002697f,-2.997000f,6.003000f,0.002697f,0.000000f,9.000000f,-0.000000f,0.000000f,9.000000f,-0.000000f,-9.000000f,9.000000f,-0.000000f,-6.003000f,6.003000f,0.002697f,-6.003000f,1.748874f,-0.000000f,-9.000000f,-9.000000f,0.000000f,-6.003000f,-1.748874f,0.000000f,-6.003000f,2.001000f,-0.000000f,-6.003000f,6.003000f,0.002697f,-9.000000f,9.000000f,-0.000000f,-9.000000f,9.000000f,-0.000000f,-6.003000f,1.748874f,-0.000000f,-6.003000f,2.001000f,-0.000000f,-9.000000f,9.000000f,-0.000000f,-9.000000f,-9.000000f,0.000000f,-6.003000f,1.748874f,-0.000000f,-9.000000f,-9.000000f,0.000000f,-6.003000f,-6.003000f,0.002697f,-6.003000f,-2.001000f,0.000000f,-9.000000f,-9.000000f,0.000000f,-6.003000f,-2.001000f,0.000000f,-6.003000f,-1.748874f,0.000000f,-6.003000f,-6.003000f,0.002697f,-9.000000f,-9.000000f,0.000000f,0.000000f,-9.000000f,0.000000f,-6.003000f,-6.003000f,0.002697f,0.000000f,-9.000000f,0.000000f,-2.997000f,-6.003000f,0.002697f,-2.997000f,1.748874f,1.237951f,-2.997000f,1.748874f,-0.000000f,-2.997000f,2.001000f,-0.000000f,-2.997000f,1.748874f,1.237951f,-2.997000f,2.001000f,-0.000000f,-2.997000f,2.001000f,1.515748f,-6.003000f,-2.001000f,1.515748f,-6.003000f,-6.003000f,0.002697f,-2.997000f,-6.003000f,0.002697f,-6.003000f,-2.001000f,1.515748f,-2.997000f,-6.003000f,0.002697f,-2.997000f,-2.001000f,1.515748f,-2.997000f,2.001000f,1.515748f,-2.997000f,6.003000f,0.002697f,-6.003000f,6.003000f,0.002697f,-6.003000f,6.003000f,0.002697f,-6.003000f,2.001000f,1.515748f,-2.997000f,2.001000f,1.515748f,-6.003000f,-2.001000f,0.000000f,-6.003000f,-6.003000f,0.002697f,-6.003000f,-2.001000f,1.515748f,-6.003000f,2.001000f,1.515748f,-6.003000f,6.003000f,0.002697f,-6.003000f,2.001000f,-0.000000f,-2.997000f,-2.001000f,1.515748f,-2.997000f,-6.003000f,0.002697f,-2.997000f,-2.001000f,0.000000f,-2.997000f,2.001000f,-0.000000f,-2.997000f,6.003000f,0.002697f,-2.997000f,2.001000f,1.515748f,-2.997000f,-2.001000f,1.515748f,-2.997000f,2.001000f,1.515748f,-6.003000f,2.001000f,1.515748f,-6.003000f,2.001000f,1.515748f,-6.003000f,-2.001000f,1.515748f,-2.997000f,-2.001000f,1.515748f,-2.997000f,-1.748874f,1.237951f,-2.997000f,1.748874f,1.237951f,-2.997000f,2.001000f,1.515748f,-2.997000f,-1.748874f,1.237951f,-2.997000f,2.001000f,1.515748f,-2.997000f,-2.001000f,1.515748f,-6.003000f,-1.748874f,1.237951f,-6.003000f,-1.748874f,0.000000f,-6.003000f,-2.001000f,0.000000f,-6.003000f,-1.748874f,1.237951f,-6.003000f,-2.001000f,0.000000f,-6.003000f,-2.001000f,1.515748f,-2.997000f,-2.001000f,1.515748f,-2.997000f,-2.001000f,0.000000f,-2.997000f,-1.748874f,1.237951f,-2.997000f,-2.001000f,0.000000f,-2.997000f,-1.748874f,0.000000f,-2.997000f,-1.748874f,1.237951f,-6.003000f,1.748874f,1.237951f,-6.003000f,2.001000f,1.515748f,-6.003000f,2.001000f,-0.000000f,-6.003000f,1.748874f,1.237951f,-6.003000f,2.001000f,-0.000000f,-6.003000f,1.748874f,-0.000000f,-6.003000f,1.748874f,1.237951f,-6.003000f,-1.748874f,1.237951f,-6.003000f,-2.001000f,1.515748f,-6.003000f,1.748874f,1.237951f,-6.003000f,-2.001000f,1.515748f,-6.003000f,2.001000f,1.515748f,-6.003000f,1.748874f,1.237951f,-6.003000f,1.748874f,-0.000000f,-2.997000f,1.748874f,1.237951f,-6.003000f,1.748874f,-0.000000f,-2.997000f,1.748874f,-0.000000f,-2.997000f,1.748874f,1.237951f,-6.003000f,1.748874f,-0.000000f,-6.003000f,-1.748874f,0.000000f,-2.997000f,-1.748874f,0.000000f,-6.003000f,1.748874f,-0.000000f,-2.997000f,-1.748874f,0.000000f,-2.997000f,1.748874f,-0.000000f,-6.003000f,-1.748874f,0.000000f,-6.003000f,-1.748874f,1.237951f,-2.997000f,-1.748874f,1.237951f,-2.997000f,-1.748874f,1.237951f,-2.997000f,-1.748874f,0.000000f,-6.003000f,-1.748874f,0.000000f,-6.003000f,-1.748874f,1.237951f,-6.003000f,1.748874f,1.237951f,-2.997000f,-1.748874f,1.237951f,-6.003000f,1.748874f,1.237951f,-2.997000f,1.748874f,1.237951f,-2.997000f,-1.748874f,1.237951f};
 
-static float world_normals[] = {0.000000,-1.000000,0.000000,-0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,-0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000225,0.000161,1.000000,0.000225,-0.000161,1.000000,0.000000,0.000000,1.000000,0.000225,0.000161,1.000000,0.000000,0.000000,1.000000,-0.000000,0.000000,1.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,-0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,-0.000000,-1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,-0.000000,-1.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,-0.000000,0.000000,1.000000,0.000000,0.000000,-0.000000,0.000000,1.000000,0.000787,0.000337,1.000000,0.000225,-0.000161,1.000000,-0.000000,0.000000,1.000000,0.000225,-0.000161,1.000000,0.000000,0.000000,1.000000,0.000787,0.000337,1.000000,0.000400,-0.179805,0.983702,0.000225,-0.000161,1.000000,0.000225,0.000161,1.000000,0.000787,-0.000337,1.000000,0.000000,0.000000,1.000000,0.000225,0.000161,1.000000,0.000000,0.000000,1.000000,0.000225,-0.000161,1.000000,0.000787,-0.000337,1.000000,0.000225,0.000161,1.000000,0.000532,0.119686,0.992812,-0.000320,0.143927,0.989588,0.000532,0.119686,0.992812,0.000225,0.000161,1.000000,0.000225,0.000161,1.000000,-0.000393,0.000056,1.000000,-0.000320,0.143927,0.989588,-0.000000,0.000000,1.000000,-0.000315,-0.000045,1.000000,0.000000,0.000000,1.000000,-0.000787,-0.000337,1.000000,-0.000320,0.143927,0.989588,-0.000393,0.000056,1.000000,-0.000393,0.000056,1.000000,-0.000000,0.000000,1.000000,-0.000787,-0.000337,1.000000,-0.000393,0.000056,1.000000,-0.000315,-0.000045,1.000000,-0.000000,0.000000,1.000000,-0.000315,-0.000045,1.000000,-0.000398,-0.089784,0.995961,-0.000787,0.000337,1.000000,-0.000315,-0.000045,1.000000,-0.000787,0.000337,1.000000,0.000000,0.000000,1.000000,-0.000398,-0.089784,0.995961,-0.000315,-0.000045,1.000000,0.000225,-0.000161,1.000000,-0.000398,-0.089784,0.995961,0.000225,-0.000161,1.000000,0.000400,-0.179805,0.983702,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,-0.239222,0.970965,-0.000398,-0.089784,0.995961,0.000400,-0.179805,0.983702,0.000000,-0.239222,0.970965,0.000400,-0.179805,0.983702,0.000000,-0.119611,0.992821,0.000000,0.239222,0.970965,0.000532,0.119686,0.992812,-0.000320,0.143927,0.989588,-0.000320,0.143927,0.989588,0.000000,0.119611,0.992821,0.000000,0.239222,0.970965,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,-0.119611,0.992821,0.000000,0.239222,0.970965,0.000000,0.119611,0.992821,0.000000,0.119611,0.992821,0.000000,-0.239222,0.970965,0.000000,-0.119611,0.992821,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,-0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,-0.000000,0.000000,1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,-0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,-0.000000,0.000000,1.000000,-0.000000,0.000000,1.000000,-0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,-1.000000};
+static float world_normals[] = {0.000000f,-1.000000f,0.000000f,-0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,-0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000225f,0.000161f,1.000000f,0.000225f,-0.000161f,1.000000f,0.000000f,0.000000f,1.000000f,0.000225f,0.000161f,1.000000f,0.000000f,0.000000f,1.000000f,-0.000000f,0.000000f,1.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,-0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,-0.000000f,-1.000000f,0.000000f,0.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,-0.000000f,-1.000000f,0.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,-0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,-0.000000f,0.000000f,1.000000f,0.000787f,0.000337f,1.000000f,0.000225f,-0.000161f,1.000000f,-0.000000f,0.000000f,1.000000f,0.000225f,-0.000161f,1.000000f,0.000000f,0.000000f,1.000000f,0.000787f,0.000337f,1.000000f,0.000400f,-0.179805f,0.983702f,0.000225f,-0.000161f,1.000000f,0.000225f,0.000161f,1.000000f,0.000787f,-0.000337f,1.000000f,0.000000f,0.000000f,1.000000f,0.000225f,0.000161f,1.000000f,0.000000f,0.000000f,1.000000f,0.000225f,-0.000161f,1.000000f,0.000787f,-0.000337f,1.000000f,0.000225f,0.000161f,1.000000f,0.000532f,0.119686f,0.992812f,-0.000320f,0.143927f,0.989588f,0.000532f,0.119686f,0.992812f,0.000225f,0.000161f,1.000000f,0.000225f,0.000161f,1.000000f,-0.000393f,0.000056f,1.000000f,-0.000320f,0.143927f,0.989588f,-0.000000f,0.000000f,1.000000f,-0.000315f,-0.000045f,1.000000f,0.000000f,0.000000f,1.000000f,-0.000787f,-0.000337f,1.000000f,-0.000320f,0.143927f,0.989588f,-0.000393f,0.000056f,1.000000f,-0.000393f,0.000056f,1.000000f,-0.000000f,0.000000f,1.000000f,-0.000787f,-0.000337f,1.000000f,-0.000393f,0.000056f,1.000000f,-0.000315f,-0.000045f,1.000000f,-0.000000f,0.000000f,1.000000f,-0.000315f,-0.000045f,1.000000f,-0.000398f,-0.089784f,0.995961f,-0.000787f,0.000337f,1.000000f,-0.000315f,-0.000045f,1.000000f,-0.000787f,0.000337f,1.000000f,0.000000f,0.000000f,1.000000f,-0.000398f,-0.089784f,0.995961f,-0.000315f,-0.000045f,1.000000f,0.000225f,-0.000161f,1.000000f,-0.000398f,-0.089784f,0.995961f,0.000225f,-0.000161f,1.000000f,0.000400f,-0.179805f,0.983702f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,0.000000f,-0.239222f,0.970965f,-0.000398f,-0.089784f,0.995961f,0.000400f,-0.179805f,0.983702f,0.000000f,-0.239222f,0.970965f,0.000400f,-0.179805f,0.983702f,0.000000f,-0.119611f,0.992821f,0.000000f,0.239222f,0.970965f,0.000532f,0.119686f,0.992812f,-0.000320f,0.143927f,0.989588f,-0.000320f,0.143927f,0.989588f,0.000000f,0.119611f,0.992821f,0.000000f,0.239222f,0.970965f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,0.000000f,-0.119611f,0.992821f,0.000000f,0.239222f,0.970965f,0.000000f,0.119611f,0.992821f,0.000000f,0.119611f,0.992821f,0.000000f,-0.239222f,0.970965f,0.000000f,-0.119611f,0.992821f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,-0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,-0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,-0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,-0.000000f,0.000000f,1.000000f,-0.000000f,0.000000f,1.000000f,-0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,1.000000f,0.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f,0.000000f,0.000000f,-1.000000f};
 
 
 static int world_indices[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [876] trunk/build

[<jas...@us...>]

Revision: 876
Author:   jason379
Date:     2006-03-28 11:01:33 -0800 (Tue, 28 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=876&view=rev

Log Message:
-----------
Added some additional comments to Premake scripts to make them easier to understand (I hope)

Modified Paths:
--------------
    trunk/build/README.txt
    trunk/build/ode.lua
    trunk/build/premake.lua
Modified: trunk/build/README.txt
===================================================================
--- trunk/build/README.txt	2006-03-24 23:31:44 UTC (rev 875)
+++ trunk/build/README.txt	2006-03-28 19:01:33 UTC (rev 876)
@@ -4,8 +4,7 @@
 
  SVN USERS: Before using these project files you must copy
  config-default.h to ode/include/ode/config.h (or run Premake to
- generate a new set of project files, see below). Feel free to 
- modify your copied config.h for your target environment.
+ generate a new set of project files, see below). 
 
 
  ABOUT THESE FILES

Modified: trunk/build/ode.lua
===================================================================
--- trunk/build/ode.lua	2006-03-24 23:31:44 UTC (rev 875)
+++ trunk/build/ode.lua	2006-03-28 19:01:33 UTC (rev 876)
@@ -2,6 +2,7 @@
 package.language = "c++"
 package.objdir = "obj/ode"
 
+
 -- Separate distribution files into toolset subdirectories
 
   if (options["usetargetpath"]) then
@@ -55,7 +56,6 @@
 
     table.insert(package.config["DebugDLL"].defines, "ODE_DLL")
     table.insert(package.config["ReleaseDLL"].defines, "ODE_DLL")
-  
     table.insert(package.config["DebugLib"].defines, "ODE_LIB")
     table.insert(package.config["ReleaseLib"].defines, "ODE_LIB")
   end

Modified: trunk/build/premake.lua
===================================================================
--- trunk/build/premake.lua	2006-03-24 23:31:44 UTC (rev 875)
+++ trunk/build/premake.lua	2006-03-28 19:01:33 UTC (rev 876)
@@ -1,20 +1,33 @@
 project.name = "ode"
 
-if (not options["enable-shared-only"] and not options["enable-static-only"]) then
-  project.configs = { "DebugDLL", "ReleaseDLL", "DebugLib", "ReleaseLib" }
-end
 
+-- Define the build configurations. VC6 doesn't support different output types
+-- within a project, so I must limit the configuration to just a DLL or just a
+-- static library. You can also use these flags `--enable-shared-only` and
+-- `--enable-static-only` if you want to call these packages from within your
+-- own Premake-enabled project.
 
+  if (options["target"] == "vs6" and not options["enable-static-only"]) then
+    options["enabled-shared-only"] = 1
+  end
+  
+  if (not options["enable-shared-only"] and not options["enable-static-only"]) then
+    project.configs = { "DebugDLL", "ReleaseDLL", "DebugLib", "ReleaseLib" }
+  end
+
+
 -- Project options
 
-  addoption("with-doubles",  "Enables double-precision math")
+  addoption("with-doubles",  "Use double instead of float as base numeric type")
   addoption("with-tests",    "Builds the test applications and DrawStuff library")
   addoption("no-cylinder",   "Disable cylinder collision geometry")
   addoption("no-dif",        "Exclude DIF (Dynamics Interchange Format) exports")
   addoption("no-trimesh",    "Exclude trimesh collision geometry")
   
   
--- Separate distribution files into toolset subdirectories
+-- If the `--usetargetpath` flag is specified, each set of generated files
+-- be placed in a directory named for the target toolset. This flag is
+-- used by the `--makeall` command (see below).
 
   if (options["usetargetpath"]) then
     project.path = options["target"]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [873] trunk

[<jas...@us...>]

Revision: 873
Author:   jason379
Date:     2006-03-24 11:36:06 -0800 (Fri, 24 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=873&view=rev

Log Message:
-----------
** Merged new build system from new_build branch (r860:872)

Modified Paths:
--------------
    trunk/CHANGELOG
    trunk/configure.in
    trunk/include/ode/collision.h
    trunk/include/ode/collision_space.h
    trunk/include/ode/collision_trimesh.h
    trunk/include/ode/error.h
    trunk/include/ode/export-dif.h
    trunk/include/ode/mass.h
    trunk/include/ode/matrix.h
    trunk/include/ode/memory.h
    trunk/include/ode/misc.h
    trunk/include/ode/objects.h
    trunk/include/ode/odemath.h
    trunk/include/ode/rotation.h
    trunk/include/ode/timer.h
    trunk/ode/src/joint.cpp
    trunk/ode/src/lcp.cpp
    trunk/ode/src/testing.cpp
    trunk/ode/test/test_collision.cpp

Added Paths:
-----------
    trunk/build/
    trunk/build/README.txt
    trunk/build/config-default.h
    trunk/build/config.in
    trunk/build/gnu/
    trunk/build/gnu/Makefile
    trunk/build/gnu/drawstuff.make
    trunk/build/gnu/ode.make
    trunk/build/gnu/test_I.make
    trunk/build/gnu/test_boxstack.make
    trunk/build/gnu/test_buggy.make
    trunk/build/gnu/test_chain1.make
    trunk/build/gnu/test_chain2.make
    trunk/build/gnu/test_collision.make
    trunk/build/gnu/test_crash.make
    trunk/build/gnu/test_cyl.make
    trunk/build/gnu/test_friction.make
    trunk/build/gnu/test_hinge.make
    trunk/build/gnu/test_joints.make
    trunk/build/gnu/test_moving_trimesh.make
    trunk/build/gnu/test_ode.make
    trunk/build/gnu/test_slider.make
    trunk/build/gnu/test_space.make
    trunk/build/gnu/test_space_stress.make
    trunk/build/gnu/test_step.make
    trunk/build/gnu/test_trimesh.make
    trunk/build/gnu/tests.make
    trunk/build/ode.lua
    trunk/build/premake.lua
    trunk/build/tests.lua
    trunk/build/vs2002/
    trunk/build/vs2002/drawstuff.vcproj
    trunk/build/vs2002/ode.sln
    trunk/build/vs2002/ode.vcproj
    trunk/build/vs2002/test_I.vcproj
    trunk/build/vs2002/test_boxstack.vcproj
    trunk/build/vs2002/test_buggy.vcproj
    trunk/build/vs2002/test_chain1.vcproj
    trunk/build/vs2002/test_chain2.vcproj
    trunk/build/vs2002/test_collision.vcproj
    trunk/build/vs2002/test_crash.vcproj
    trunk/build/vs2002/test_cyl.vcproj
    trunk/build/vs2002/test_friction.vcproj
    trunk/build/vs2002/test_hinge.vcproj
    trunk/build/vs2002/test_joints.vcproj
    trunk/build/vs2002/test_moving_trimesh.vcproj
    trunk/build/vs2002/test_ode.vcproj
    trunk/build/vs2002/test_slider.vcproj
    trunk/build/vs2002/test_space.vcproj
    trunk/build/vs2002/test_space_stress.vcproj
    trunk/build/vs2002/test_step.vcproj
    trunk/build/vs2002/test_trimesh.vcproj
    trunk/build/vs2002/tests.vcproj
    trunk/build/vs2003/
    trunk/build/vs2003/drawstuff.vcproj
    trunk/build/vs2003/ode.sln
    trunk/build/vs2003/ode.vcproj
    trunk/build/vs2003/test_I.vcproj
    trunk/build/vs2003/test_boxstack.vcproj
    trunk/build/vs2003/test_buggy.vcproj
    trunk/build/vs2003/test_chain1.vcproj
    trunk/build/vs2003/test_chain2.vcproj
    trunk/build/vs2003/test_collision.vcproj
    trunk/build/vs2003/test_crash.vcproj
    trunk/build/vs2003/test_cyl.vcproj
    trunk/build/vs2003/test_friction.vcproj
    trunk/build/vs2003/test_hinge.vcproj
    trunk/build/vs2003/test_joints.vcproj
    trunk/build/vs2003/test_moving_trimesh.vcproj
    trunk/build/vs2003/test_ode.vcproj
    trunk/build/vs2003/test_slider.vcproj
    trunk/build/vs2003/test_space.vcproj
    trunk/build/vs2003/test_space_stress.vcproj
    trunk/build/vs2003/test_step.vcproj
    trunk/build/vs2003/test_trimesh.vcproj
    trunk/build/vs2003/tests.vcproj
    trunk/build/vs2005/
    trunk/build/vs2005/drawstuff.vcproj
    trunk/build/vs2005/ode.sln
    trunk/build/vs2005/ode.vcproj
    trunk/build/vs2005/test_I.vcproj
    trunk/build/vs2005/test_boxstack.vcproj
    trunk/build/vs2005/test_buggy.vcproj
    trunk/build/vs2005/test_chain1.vcproj
    trunk/build/vs2005/test_chain2.vcproj
    trunk/build/vs2005/test_collision.vcproj
    trunk/build/vs2005/test_crash.vcproj
    trunk/build/vs2005/test_cyl.vcproj
    trunk/build/vs2005/test_friction.vcproj
    trunk/build/vs2005/test_hinge.vcproj
    trunk/build/vs2005/test_joints.vcproj
    trunk/build/vs2005/test_moving_trimesh.vcproj
    trunk/build/vs2005/test_ode.vcproj
    trunk/build/vs2005/test_slider.vcproj
    trunk/build/vs2005/test_space.vcproj
    trunk/build/vs2005/test_space_stress.vcproj
    trunk/build/vs2005/test_step.vcproj
    trunk/build/vs2005/test_trimesh.vcproj
    trunk/build/vs2005/tests.vcproj
    trunk/build/vs6/
    trunk/build/vs6/drawstuff.dsp
    trunk/build/vs6/ode.dsp
    trunk/build/vs6/ode.dsw
    trunk/build/vs6/test_I.dsp
    trunk/build/vs6/test_boxstack.dsp
    trunk/build/vs6/test_buggy.dsp
    trunk/build/vs6/test_chain1.dsp
    trunk/build/vs6/test_chain2.dsp
    trunk/build/vs6/test_collision.dsp
    trunk/build/vs6/test_crash.dsp
    trunk/build/vs6/test_cyl.dsp
    trunk/build/vs6/test_friction.dsp
    trunk/build/vs6/test_hinge.dsp
    trunk/build/vs6/test_joints.dsp
    trunk/build/vs6/test_moving_trimesh.dsp
    trunk/build/vs6/test_ode.dsp
    trunk/build/vs6/test_slider.dsp
    trunk/build/vs6/test_space.dsp
    trunk/build/vs6/test_space_stress.dsp
    trunk/build/vs6/test_step.dsp
    trunk/build/vs6/test_trimesh.dsp
    trunk/build/vs6/tests.dsp

Removed Paths:
-------------
    trunk/build/README.txt
    trunk/build/config-default.h
    trunk/build/config.in
    trunk/build/gnu/
    trunk/build/gnu/Makefile
    trunk/build/gnu/drawstuff.make
    trunk/build/gnu/ode.make
    trunk/build/gnu/test_I.make
    trunk/build/gnu/test_boxstack.make
    trunk/build/gnu/test_buggy.make
    trunk/build/gnu/test_chain1.make
    trunk/build/gnu/test_chain2.make
    trunk/build/gnu/test_collision.make
    trunk/build/gnu/test_crash.make
    trunk/build/gnu/test_cyl.make
    trunk/build/gnu/test_friction.make
    trunk/build/gnu/test_hinge.make
    trunk/build/gnu/test_joints.make
    trunk/build/gnu/test_moving_trimesh.make
    trunk/build/gnu/test_ode.make
    trunk/build/gnu/test_slider.make
    trunk/build/gnu/test_space.make
    trunk/build/gnu/test_space_stress.make
    trunk/build/gnu/test_step.make
    trunk/build/gnu/test_trimesh.make
    trunk/build/gnu/tests.make
    trunk/build/ode.lua
    trunk/build/premake.lua
    trunk/build/tests.lua
    trunk/build/vs2002/
    trunk/build/vs2002/drawstuff.vcproj
    trunk/build/vs2002/ode.sln
    trunk/build/vs2002/ode.vcproj
    trunk/build/vs2002/test_I.vcproj
    trunk/build/vs2002/test_boxstack.vcproj
    trunk/build/vs2002/test_buggy.vcproj
    trunk/build/vs2002/test_chain1.vcproj
    trunk/build/vs2002/test_chain2.vcproj
    trunk/build/vs2002/test_collision.vcproj
    trunk/build/vs2002/test_crash.vcproj
    trunk/build/vs2002/test_cyl.vcproj
    trunk/build/vs2002/test_friction.vcproj
    trunk/build/vs2002/test_hinge.vcproj
    trunk/build/vs2002/test_joints.vcproj
    trunk/build/vs2002/test_moving_trimesh.vcproj
    trunk/build/vs2002/test_ode.vcproj
    trunk/build/vs2002/test_slider.vcproj
    trunk/build/vs2002/test_space.vcproj
    trunk/build/vs2002/test_space_stress.vcproj
    trunk/build/vs2002/test_step.vcproj
    trunk/build/vs2002/test_trimesh.vcproj
    trunk/build/vs2002/tests.vcproj
    trunk/build/vs2003/
    trunk/build/vs2003/drawstuff.vcproj
    trunk/build/vs2003/ode.sln
    trunk/build/vs2003/ode.vcproj
    trunk/build/vs2003/test_I.vcproj
    trunk/build/vs2003/test_boxstack.vcproj
    trunk/build/vs2003/test_buggy.vcproj
    trunk/build/vs2003/test_chain1.vcproj
    trunk/build/vs2003/test_chain2.vcproj
    trunk/build/vs2003/test_collision.vcproj
    trunk/build/vs2003/test_crash.vcproj
    trunk/build/vs2003/test_cyl.vcproj
    trunk/build/vs2003/test_friction.vcproj
    trunk/build/vs2003/test_hinge.vcproj
    trunk/build/vs2003/test_joints.vcproj
    trunk/build/vs2003/test_moving_trimesh.vcproj
    trunk/build/vs2003/test_ode.vcproj
    trunk/build/vs2003/test_slider.vcproj
    trunk/build/vs2003/test_space.vcproj
    trunk/build/vs2003/test_space_stress.vcproj
    trunk/build/vs2003/test_step.vcproj
    trunk/build/vs2003/test_trimesh.vcproj
    trunk/build/vs2003/tests.vcproj
    trunk/build/vs2005/
    trunk/build/vs2005/drawstuff.vcproj
    trunk/build/vs2005/ode.sln
    trunk/build/vs2005/ode.vcproj
    trunk/build/vs2005/test_I.vcproj
    trunk/build/vs2005/test_boxstack.vcproj
    trunk/build/vs2005/test_buggy.vcproj
    trunk/build/vs2005/test_chain1.vcproj
    trunk/build/vs2005/test_chain2.vcproj
    trunk/build/vs2005/test_collision.vcproj
    trunk/build/vs2005/test_crash.vcproj
    trunk/build/vs2005/test_cyl.vcproj
    trunk/build/vs2005/test_friction.vcproj
    trunk/build/vs2005/test_hinge.vcproj
    trunk/build/vs2005/test_joints.vcproj
    trunk/build/vs2005/test_moving_trimesh.vcproj
    trunk/build/vs2005/test_ode.vcproj
    trunk/build/vs2005/test_slider.vcproj
    trunk/build/vs2005/test_space.vcproj
    trunk/build/vs2005/test_space_stress.vcproj
    trunk/build/vs2005/test_step.vcproj
    trunk/build/vs2005/test_trimesh.vcproj
    trunk/build/vs2005/tests.vcproj
    trunk/build/vs6/
    trunk/build/vs6/drawstuff.dsp
    trunk/build/vs6/ode.dsp
    trunk/build/vs6/ode.dsw
    trunk/build/vs6/test_I.dsp
    trunk/build/vs6/test_boxstack.dsp
    trunk/build/vs6/test_buggy.dsp
    trunk/build/vs6/test_chain1.dsp
    trunk/build/vs6/test_chain2.dsp
    trunk/build/vs6/test_collision.dsp
    trunk/build/vs6/test_crash.dsp
    trunk/build/vs6/test_cyl.dsp
    trunk/build/vs6/test_friction.dsp
    trunk/build/vs6/test_hinge.dsp
    trunk/build/vs6/test_joints.dsp
    trunk/build/vs6/test_moving_trimesh.dsp
    trunk/build/vs6/test_ode.dsp
    trunk/build/vs6/test_slider.dsp
    trunk/build/vs6/test_space.dsp
    trunk/build/vs6/test_space_stress.dsp
    trunk/build/vs6/test_step.dsp
    trunk/build/vs6/test_trimesh.dsp
    trunk/build/vs6/tests.dsp
    trunk/tests/CppTestHarness/TestCppTestHarness/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [872] branches/new_build/build

[<jas...@us...>]

Revision: 872
Author:   jason379
Date:     2006-03-24 11:18:58 -0800 (Fri, 24 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=872&view=rev

Log Message:
-----------
Regenerated VS project files for move to trunk

Modified Paths:
--------------
    branches/new_build/build/vs2002/drawstuff.vcproj
    branches/new_build/build/vs2002/ode.sln
    branches/new_build/build/vs2002/ode.vcproj
    branches/new_build/build/vs2002/test_I.vcproj
    branches/new_build/build/vs2002/test_boxstack.vcproj
    branches/new_build/build/vs2002/test_buggy.vcproj
    branches/new_build/build/vs2002/test_chain1.vcproj
    branches/new_build/build/vs2002/test_chain2.vcproj
    branches/new_build/build/vs2002/test_collision.vcproj
    branches/new_build/build/vs2002/test_crash.vcproj
    branches/new_build/build/vs2002/test_cyl.vcproj
    branches/new_build/build/vs2002/test_friction.vcproj
    branches/new_build/build/vs2002/test_hinge.vcproj
    branches/new_build/build/vs2002/test_joints.vcproj
    branches/new_build/build/vs2002/test_moving_trimesh.vcproj
    branches/new_build/build/vs2002/test_ode.vcproj
    branches/new_build/build/vs2002/test_slider.vcproj
    branches/new_build/build/vs2002/test_space.vcproj
    branches/new_build/build/vs2002/test_space_stress.vcproj
    branches/new_build/build/vs2002/test_step.vcproj
    branches/new_build/build/vs2002/test_trimesh.vcproj
    branches/new_build/build/vs2002/tests.vcproj
    branches/new_build/build/vs2003/drawstuff.vcproj
    branches/new_build/build/vs2003/ode.sln
    branches/new_build/build/vs2003/ode.vcproj
    branches/new_build/build/vs2003/test_I.vcproj
    branches/new_build/build/vs2003/test_boxstack.vcproj
    branches/new_build/build/vs2003/test_buggy.vcproj
    branches/new_build/build/vs2003/test_chain1.vcproj
    branches/new_build/build/vs2003/test_chain2.vcproj
    branches/new_build/build/vs2003/test_collision.vcproj
    branches/new_build/build/vs2003/test_crash.vcproj
    branches/new_build/build/vs2003/test_cyl.vcproj
    branches/new_build/build/vs2003/test_friction.vcproj
    branches/new_build/build/vs2003/test_hinge.vcproj
    branches/new_build/build/vs2003/test_joints.vcproj
    branches/new_build/build/vs2003/test_moving_trimesh.vcproj
    branches/new_build/build/vs2003/test_ode.vcproj
    branches/new_build/build/vs2003/test_slider.vcproj
    branches/new_build/build/vs2003/test_space.vcproj
    branches/new_build/build/vs2003/test_space_stress.vcproj
    branches/new_build/build/vs2003/test_step.vcproj
    branches/new_build/build/vs2003/test_trimesh.vcproj
    branches/new_build/build/vs2003/tests.vcproj
    branches/new_build/build/vs2005/drawstuff.vcproj
    branches/new_build/build/vs2005/ode.sln
    branches/new_build/build/vs2005/ode.vcproj
    branches/new_build/build/vs2005/test_I.vcproj
    branches/new_build/build/vs2005/test_boxstack.vcproj
    branches/new_build/build/vs2005/test_buggy.vcproj
    branches/new_build/build/vs2005/test_chain1.vcproj
    branches/new_build/build/vs2005/test_chain2.vcproj
    branches/new_build/build/vs2005/test_collision.vcproj
    branches/new_build/build/vs2005/test_crash.vcproj
    branches/new_build/build/vs2005/test_cyl.vcproj
    branches/new_build/build/vs2005/test_friction.vcproj
    branches/new_build/build/vs2005/test_hinge.vcproj
    branches/new_build/build/vs2005/test_joints.vcproj
    branches/new_build/build/vs2005/test_moving_trimesh.vcproj
    branches/new_build/build/vs2005/test_ode.vcproj
    branches/new_build/build/vs2005/test_slider.vcproj
    branches/new_build/build/vs2005/test_space.vcproj
    branches/new_build/build/vs2005/test_space_stress.vcproj
    branches/new_build/build/vs2005/test_step.vcproj
    branches/new_build/build/vs2005/test_trimesh.vcproj
    branches/new_build/build/vs2005/tests.vcproj
    branches/new_build/build/vs6/drawstuff.dsp
    branches/new_build/build/vs6/ode.dsp
    branches/new_build/build/vs6/test_I.dsp
    branches/new_build/build/vs6/test_boxstack.dsp
    branches/new_build/build/vs6/test_buggy.dsp
    branches/new_build/build/vs6/test_chain1.dsp
    branches/new_build/build/vs6/test_chain2.dsp
    branches/new_build/build/vs6/test_collision.dsp
    branches/new_build/build/vs6/test_crash.dsp
    branches/new_build/build/vs6/test_cyl.dsp
    branches/new_build/build/vs6/test_friction.dsp
    branches/new_build/build/vs6/test_hinge.dsp
    branches/new_build/build/vs6/test_joints.dsp
    branches/new_build/build/vs6/test_moving_trimesh.dsp
    branches/new_build/build/vs6/test_ode.dsp
    branches/new_build/build/vs6/test_slider.dsp
    branches/new_build/build/vs6/test_space.dsp
    branches/new_build/build/vs6/test_space_stress.dsp
    branches/new_build/build/vs6/test_step.dsp
    branches/new_build/build/vs6/test_trimesh.dsp
    branches/new_build/build/vs6/tests.dsp

Added Paths:
-----------
    branches/new_build/build/gnu/
    branches/new_build/build/gnu/Makefile
    branches/new_build/build/gnu/drawstuff.make
    branches/new_build/build/gnu/ode.make
    branches/new_build/build/gnu/test_I.make
    branches/new_build/build/gnu/test_boxstack.make
    branches/new_build/build/gnu/test_buggy.make
    branches/new_build/build/gnu/test_chain1.make
    branches/new_build/build/gnu/test_chain2.make
    branches/new_build/build/gnu/test_collision.make
    branches/new_build/build/gnu/test_crash.make
    branches/new_build/build/gnu/test_cyl.make
    branches/new_build/build/gnu/test_friction.make
    branches/new_build/build/gnu/test_hinge.make
    branches/new_build/build/gnu/test_joints.make
    branches/new_build/build/gnu/test_moving_trimesh.make
    branches/new_build/build/gnu/test_ode.make
    branches/new_build/build/gnu/test_slider.make
    branches/new_build/build/gnu/test_space.make
    branches/new_build/build/gnu/test_space_stress.make
    branches/new_build/build/gnu/test_step.make
    branches/new_build/build/gnu/test_trimesh.make
    branches/new_build/build/gnu/tests.make

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [871] branches/new_build/build

[<jas...@us...>]

Revision: 871
Author:   jason379
Date:     2006-03-23 13:51:38 -0800 (Thu, 23 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=871&view=rev

Log Message:
-----------
A few last changes to make it easier to embed ODE in another premake-built project

Modified Paths:
--------------
    branches/new_build/build/ode.lua
    branches/new_build/build/premake.lua
    branches/new_build/build/tests.lua
Modified: branches/new_build/build/ode.lua
===================================================================
--- branches/new_build/build/ode.lua	2006-03-23 21:25:26 UTC (rev 870)
+++ branches/new_build/build/ode.lua	2006-03-23 21:51:38 UTC (rev 871)
@@ -1,7 +1,14 @@
 package.name = "ode"
 package.language = "c++"
 package.objdir = "obj/ode"
-package.path = packagepath
+
+-- Separate distribution files into toolset subdirectories
+
+  if (options["usetargetpath"]) then
+    package.path = options["target"]
+  else
+    package.path = "custom"
+  end
   
 
 -- Write a custom <config.h> to include/ode, based on the specified flags

Modified: branches/new_build/build/premake.lua
===================================================================
--- branches/new_build/build/premake.lua	2006-03-23 21:25:26 UTC (rev 870)
+++ branches/new_build/build/premake.lua	2006-03-23 21:51:38 UTC (rev 871)
@@ -14,13 +14,10 @@
   addoption("no-trimesh",    "Exclude trimesh collision geometry")
   
   
--- Separate package files into a subdirectory
+-- Separate distribution files into toolset subdirectories
 
   if (options["usetargetpath"]) then
     project.path = options["target"]
-    packagepath = options["target"]
-  else
-    packagepath = "custom"
   end
 
 

Modified: branches/new_build/build/tests.lua
===================================================================
--- branches/new_build/build/tests.lua	2006-03-23 21:25:26 UTC (rev 870)
+++ branches/new_build/build/tests.lua	2006-03-23 21:51:38 UTC (rev 871)
@@ -1,3 +1,12 @@
+-- Separate distribution files into toolset subdirectories
+
+  if (options["usetargetpath"]) then
+    packagepath = options["target"]
+  else
+    packagepath = "custom"
+  end
+
+
 -- DrawStuff library
 
   package.name = "drawstuff"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [870] branches/new_build

[<jas...@us...>]

Revision: 870
Author:   jason379
Date:     2006-03-23 13:25:26 -0800 (Thu, 23 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=870&view=rev

Log Message:
-----------
Improved premake support for custom build configurations

Modified Paths:
--------------
    branches/new_build/build/README.txt
    branches/new_build/build/ode.lua
    branches/new_build/build/premake.lua
    branches/new_build/build/tests.lua
    branches/new_build/configure.in
Modified: branches/new_build/build/README.txt
===================================================================
--- branches/new_build/build/README.txt	2006-03-23 20:20:28 UTC (rev 869)
+++ branches/new_build/build/README.txt	2006-03-23 21:25:26 UTC (rev 870)
@@ -2,12 +2,46 @@
 Contributed by Jason Perkins (jas...@us...)
 -------------------------------------------------------------------
 
-SVN USERS: Before using these project files you must copy
-config-default.h to ode/include/ode/config.h. 
+ SVN USERS: Before using these project files you must copy
+ config-default.h to ode/include/ode/config.h (or run Premake to
+ generate a new set of project files, see below). Feel free to 
+ modify your copied config.h for your target environment.
 
-This is my first take on a replacement set of Visual Studio project
-files. They work fairly well, but have not been thorougly tested 
-yet. Once I'm convinced the system is reasonably bulletproof I will 
-write up additional documentation, including how to generate custom 
-project files, and merge everything into the project trunk.
 
+ ABOUT THESE FILES
+
+ This is my first take on a replacement set of Visual Studio project
+ files. They work fairly well, but have not been thorougly tested 
+ yet. Once I'm convinced the system is reasonably bulletproof I will 
+ write up additional documentation, including how to generate custom 
+ project files, and merge everything into the project trunk.
+
+ These project files are automatically generated using a tool called
+ Premake, available from http://premake.sourceforge.net/. The scripts
+ used to build them have the ".lua" file extension. To regenerate the
+ stock project files for inclusion in a new release, type:
+
+   premake --makeall
+
+
+ CREATING CUSTOM PROJECT FILES
+
+ To create a set of custom project files, first type `premake --help`
+ to see the options that you have available. Then generate the new
+ project files using the form:
+
+   premake [options] --target [toolset]
+
+ For instance:
+
+   premake --no-trimesh --target vs2005
+
+ If you ever decide that you want to remove your custom project, you
+ can just type:
+
+   premake --clean
+
+ Feel free to direct any questions or comments to myself or the ODE
+ mailing list.
+
+

Modified: branches/new_build/build/ode.lua
===================================================================
--- branches/new_build/build/ode.lua	2006-03-23 20:20:28 UTC (rev 869)
+++ branches/new_build/build/ode.lua	2006-03-23 21:25:26 UTC (rev 870)
@@ -1,9 +1,9 @@
 package.name = "ode"
-package.path = options["target"]
 package.language = "c++"
 package.objdir = "obj/ode"
+package.path = packagepath
+  
 
-
 -- Write a custom <config.h> to include/ode, based on the specified flags
 
   io.input("config.in")
@@ -34,16 +34,24 @@
   
 -- Package Build Settings
 
-  package.config["DebugDLL"].kind = "dll"
-  package.config["DebugLib"].kind = "lib"
-  package.config["ReleaseDLL"].kind = "dll"
-  package.config["ReleaseLib"].kind = "lib"
+  if (options["enable-shared-only"]) then
+    package.kind = "dll"
+    table.insert(package.defines, "ODE_DLL")
+  elseif (options["enable-static-only"]) then
+    package.kind = "lib"
+    table.insert(package.defines, "ODE_LIB")
+  else
+    package.config["DebugDLL"].kind = "dll"
+    package.config["DebugLib"].kind = "lib"
+    package.config["ReleaseDLL"].kind = "dll"
+    package.config["ReleaseLib"].kind = "lib"
 
-  table.insert(package.config["DebugDLL"].defines, "ODE_DLL")
-  table.insert(package.config["ReleaseDLL"].defines, "ODE_DLL")
+    table.insert(package.config["DebugDLL"].defines, "ODE_DLL")
+    table.insert(package.config["ReleaseDLL"].defines, "ODE_DLL")
   
-  table.insert(package.config["DebugLib"].defines, "ODE_LIB")
-  table.insert(package.config["ReleaseLib"].defines, "ODE_LIB")
+    table.insert(package.config["DebugLib"].defines, "ODE_LIB")
+    table.insert(package.config["ReleaseLib"].defines, "ODE_LIB")
+  end
   
   package.includepaths =
   {
@@ -55,7 +63,7 @@
     table.insert(package.defines, "WIN32")
   end
  
- -- disable VS2005 CRT security warnings
+  -- disable VS2005 CRT security warnings
   if (options["target"] == "vs2005") then
     table.insert(package.defines, "_CRT_SECURE_NO_DEPRECATE")
   end

Modified: branches/new_build/build/premake.lua
===================================================================
--- branches/new_build/build/premake.lua	2006-03-23 20:20:28 UTC (rev 869)
+++ branches/new_build/build/premake.lua	2006-03-23 21:25:26 UTC (rev 870)
@@ -1,43 +1,46 @@
 project.name = "ode"
 
-project.configs = { "DebugDLL", "ReleaseDLL", "DebugLib", "ReleaseLib" }
+if (not options["enable-shared-only"] and not options["enable-static-only"]) then
+  project.configs = { "DebugDLL", "ReleaseDLL", "DebugLib", "ReleaseLib" }
+end
 
 
 -- Project options
 
-  addoption("enable-static", "Build ODE as a static library instead of a DLL")
   addoption("with-doubles",  "Enables double-precision math")
   addoption("with-tests",    "Builds the test applications and DrawStuff library")
   addoption("no-cylinder",   "Disable cylinder collision geometry")
   addoption("no-dif",        "Exclude DIF (Dynamics Interchange Format) exports")
-  addoption("no-trimesh",    "Exclude trimesh support")
+  addoption("no-trimesh",    "Exclude trimesh collision geometry")
   
   
--- Bit of a hack right of the bat: I want to put each set of project files
--- into a directory with the same name as the target toolset, so I key off
--- of options["target"]. But if I run `--clean`, there is no target and
--- Premake bombs. So make sure there is always a target specified.
+-- Separate package files into a subdirectory
 
-  if (not options["target"]) then
-    options["target"] = ""
+  if (options["usetargetpath"]) then
+    project.path = options["target"]
+    packagepath = options["target"]
+  else
+    packagepath = "custom"
   end
 
-  project.path = options["target"]
 
-
 -- Set the output directories
 
-  project.config["DebugDLL"].bindir = "../lib/DebugDLL"
-  project.config["DebugDLL"].libdir = "../lib/DebugDLL"
-
-  project.config["ReleaseDLL"].bindir = "../lib/ReleaseDLL"
-  project.config["ReleaseDLL"].libdir = "../lib/ReleaseDLL"
-
-  project.config["DebugLib"].bindir = "../lib/DebugLib"
-  project.config["DebugLib"].libdir = "../lib/DebugLib"
-
-  project.config["ReleaseLib"].bindir = "../lib/ReleaseLib"
-  project.config["ReleaseLib"].libdir = "../lib/ReleaseLib"
+  if (options["enable-shared-only"] or options["enable-static-only"]) then
+    project.config["Debug"].bindir   = "../lib/debug"
+    project.config["Debug"].libdir   = "../lib/debug"
+    project.config["Release"].bindir = "../lib/release"
+    project.config["Release"].bindir = "../lib/release"
+  else
+    project.config["DebugDLL"].bindir   = "../lib/DebugDLL"
+    project.config["DebugDLL"].libdir   = "../lib/DebugDLL"
+    project.config["ReleaseDLL"].bindir = "../lib/ReleaseDLL"
+    project.config["ReleaseDLL"].libdir = "../lib/ReleaseDLL"
+    project.config["DebugLib"].bindir   = "../lib/DebugLib"
+    project.config["DebugLib"].libdir   = "../lib/DebugLib"
+    project.config["ReleaseLib"].bindir = "../lib/ReleaseLib"
+    project.config["ReleaseLib"].libdir = "../lib/ReleaseLib"
+  end
   
 
 -- Build packages
@@ -49,26 +52,35 @@
   end
     
 	
--- Since package.path is set to target, --clean doesn't work as
--- expected. Remove what I can from here.
+-- Remove all intermediate files
 
   function doclean(cmd, arg)
     docommand(cmd, arg)
     if (options["target"] == "") then
       os.remove("../include/ode/config.h")
     end
+    os.rmdir("custom")
     os.rmdir("../lib/debug")
     os.rmdir("../lib/release")
+    os.rmdir("../lib/DebugDLL")
+    os.rmdir("../lib/DebugLib")
+    os.rmdir("../lib/ReleaseDLL")
+    os.rmdir("../lib/ReleaseLib")
+    os.rmdir("gnu/obj")
+    os.rmdir("vs6/obj")
+    os.rmdir("vs2002/obj")
+    os.rmdir("vs2003/obj")
+    os.rmdir("vs2005/obj")
   end
 
 
 -- Generate all toolsets in one go
 
   function domakeall(cmd, arg)
-    os.execute("premake --with-tests --clean --target vs6")
-    os.execute("premake --with-tests --clean --target vs2002")
-    os.execute("premake --with-tests --clean --target vs2003")
-    os.execute("premake --with-tests --clean --target vs2005")
-    -- os.execute("premake --with-tests --clean --target gnu") -- not ready yet
+    os.execute("premake --usetargetpath --with-tests --clean --target vs6")
+    os.execute("premake --usetargetpath --with-tests --clean --target vs2002")
+    os.execute("premake --usetargetpath --with-tests --clean --target vs2003")
+    os.execute("premake --usetargetpath --with-tests --clean --target vs2005")
+    os.execute("premake --usetargetpath --with-tests --clean --target gnu")
   end
   
\ No newline at end of file

Modified: branches/new_build/build/tests.lua
===================================================================
--- branches/new_build/build/tests.lua	2006-03-23 20:20:28 UTC (rev 869)
+++ branches/new_build/build/tests.lua	2006-03-23 21:25:26 UTC (rev 870)
@@ -1,9 +1,9 @@
 -- DrawStuff library
 
   package.name = "drawstuff"
-  package.path = options["target"]
   package.kind = "lib"
   package.language = "c++"
+  package.path = packagepath
 
   package.includepaths =
   {
@@ -34,9 +34,9 @@
   function maketest(name)
     package = newpackage()
     package.name = "test_" .. name
-    package.path = options["target"]
     package.kind = "exe"
     package.language = "c++"
+    package.path = packagepath
     package.objdir = "obj/"..name
   
     package.includepaths = { "../../include" }
@@ -91,9 +91,9 @@
 
   package = newpackage()
   package.name = "tests"
-  package.path = options["target"]
   package.kind = "exe"
   package.language = "c++"
+  package.path = packagepath
   package.objdir = "obj/tests"
   
   package.includepaths =

Modified: branches/new_build/configure.in
===================================================================
--- branches/new_build/configure.in	2006-03-23 20:20:28 UTC (rev 869)
+++ branches/new_build/configure.in	2006-03-23 21:25:26 UTC (rev 870)
@@ -390,12 +390,12 @@
 #endif
 
 /* Handle Windows DLL odities */
-#if defined(DLL_EXPORT) && defined(WIN32)
-#define DLL __declspec( dllexport )
-#elif !defined(DLL_EXPORT) && defined(WIN32)
-#define DLL __declspec( dllimport )
+#if defined(ODE_DLL) && defined(WIN32)
+#define ODE_API __declspec( dllexport )
+#elif !defined(ODE_DLL) && defined(WIN32)
+#define ODE_API __declspec( dllimport )
 #else
-#define DLL
+#define ODE_API
 #endif
 
 #endif /* #define ODE_CONFIG_H */
@@ -409,7 +409,7 @@
     ;;
   cygwin* | mingw*)
     so_ext=".dll"
-    DLLDEFINE="-DDLL_EXPORT"
+    DLLDEFINE="-DODE_DLL"
     ;;
   *apple*) # For Mac OS X
     so_ext=".dylib"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [869] branches/new_build/build

[<jas...@us...>]

Revision: 869
Author:   jason379
Date:     2006-03-23 12:20:28 -0800 (Thu, 23 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=869&view=rev

Log Message:
-----------
Premake scripts now generate both static and DLL configurations. Overhauled generated config.h to make user modification easier.

Modified Paths:
--------------
    branches/new_build/build/config-default.h
    branches/new_build/build/config.in
    branches/new_build/build/ode.lua
    branches/new_build/build/premake.lua
    branches/new_build/build/tests.lua
Modified: branches/new_build/build/config-default.h
===================================================================
--- branches/new_build/build/config-default.h	2006-03-23 00:54:04 UTC (rev 868)
+++ branches/new_build/build/config-default.h	2006-03-23 20:20:28 UTC (rev 869)
@@ -1,7 +1,36 @@
 /* This file was autogenerated by Premake */
 #ifndef _ODE_CONFIG_H_
 #define _ODE_CONFIG_H_
+	
 
+/******************************************************************
+ * CONFIGURATON SETTINGS - you can change these, and then rebuild
+ *   ODE to modify the behavior of the library.
+ *
+ *   dSINGLE/dDOUBLE   - force ODE to use single-precision (float)
+ *                       or double-precision (double) for numbers
+ *
+ *   dCYLINDER_ENABLED - enable/disable cylinder support
+ *
+ *   dTRIMESH_ENABLED  - enable/disable trimesh support
+ *
+ ******************************************************************/
+
+#define dSINGLE 1
+
+#define dCYLINDER_ENABLED 1
+
+#define dTRIMESH_ENABLED 1
+
+
+
+/******************************************************************
+ * SYSTEM SETTINGS - you shouldn't need to change these. If you
+ *   run into an issue with these settings, please report it to
+ *   the ODE bug tracker at:
+ *      http://sf.net/tracker/?group_id=24884&atid=382799
+ ******************************************************************/
+
 /* Try to identify the platform */
 #if defined(_MSC_VER) || defined(__CYGWIN32__) || defined(__MINGW32__)
   #define ODE_PLATFORM_WINDOWS
@@ -29,12 +58,14 @@
 
 /* Define a DLL export symbol for those platforms that need it */
 #if defined(ODE_PLATFORM_WINDOWS)
-  #if defined(ODE_DLL_EXPORT)
+  #if defined(ODE_DLL)
     #define ODE_API __declspec(dllexport)
-  #else
-    #define ODE_API __declspec(dllimport)
+  #elif !defined(ODE_LIB)
+    #define ODE_DLL_API __declspec(dllimport)
   #endif
-#else
+#endif
+    
+#if !defined(ODE_API)
   #define ODE_API
 #endif
 
@@ -74,7 +105,15 @@
 	#define ODE_INFINITY8 (__ode_huge_val.__d)
 #endif
 
+#if dSINGLE
+	#define dInfinity ODE_INFINITY4
+	#define dEpsilon  FLT_EPSILON
+#else
+	#define dInfinity ODE_INFINITY8
+	#define dEpsilon  DBL_EPSILON
+#endif
 
+
 /* Well-defined common data types...need to define for 64 bit systems */
 #if defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
   #define X86_64_SYSTEM   1
@@ -111,11 +150,4 @@
 /* Define this if your system supports anonymous memory maps (linux does) */
 #define MMAP_ANONYMOUS
 
-/* Configuration options */
-#define dSINGLE 1
-#define dInfinity ODE_INFINITY4
-#define dEpsilon FLT_EPSILON
-#define dCYLINDER_ENABLED 1
-#define dTRIMESH_ENABLED 1
-
 #endif

Modified: branches/new_build/build/config.in
===================================================================
--- branches/new_build/build/config.in	2006-03-23 00:54:04 UTC (rev 868)
+++ branches/new_build/build/config.in	2006-03-23 20:20:28 UTC (rev 869)
@@ -1,7 +1,36 @@
 /* This file was autogenerated by Premake */
 #ifndef _ODE_CONFIG_H_
 #define _ODE_CONFIG_H_
+	
 
+/******************************************************************
+ * CONFIGURATON SETTINGS - you can change these, and then rebuild
+ *   ODE to modify the behavior of the library.
+ *
+ *   dSINGLE/dDOUBLE   - force ODE to use single-precision (float)
+ *                       or double-precision (double) for numbers
+ *
+ *   dCYLINDER_ENABLED - enable/disable cylinder support
+ *
+ *   dTRIMESH_ENABLED  - enable/disable trimesh support
+ *
+ ******************************************************************/
+
+#define {PRECISION} 1
+
+#define dCYLINDER_ENABLED {CYLINDER}
+
+#define dTRIMESH_ENABLED {TRIMESH}
+
+
+
+/******************************************************************
+ * SYSTEM SETTINGS - you shouldn't need to change these. If you
+ *   run into an issue with these settings, please report it to
+ *   the ODE bug tracker at:
+ *      http://sf.net/tracker/?group_id=24884&atid=382799
+ ******************************************************************/
+
 /* Try to identify the platform */
 #if defined(_MSC_VER) || defined(__CYGWIN32__) || defined(__MINGW32__)
   #define ODE_PLATFORM_WINDOWS
@@ -29,12 +58,14 @@
 
 /* Define a DLL export symbol for those platforms that need it */
 #if defined(ODE_PLATFORM_WINDOWS)
-  #if defined(ODE_DLL_EXPORT)
+  #if defined(ODE_DLL)
     #define ODE_API __declspec(dllexport)
-  #else
-    #define ODE_API __declspec(dllimport)
+  #elif !defined(ODE_LIB)
+    #define ODE_DLL_API __declspec(dllimport)
   #endif
-#else
+#endif
+    
+#if !defined(ODE_API)
   #define ODE_API
 #endif
 
@@ -74,7 +105,15 @@
 	#define ODE_INFINITY8 (__ode_huge_val.__d)
 #endif
 
+#if dSINGLE
+	#define dInfinity ODE_INFINITY4
+	#define dEpsilon  FLT_EPSILON
+#else
+	#define dInfinity ODE_INFINITY8
+	#define dEpsilon  DBL_EPSILON
+#endif
 
+
 /* Well-defined common data types...need to define for 64 bit systems */
 #if defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
   #define X86_64_SYSTEM   1
@@ -111,4 +150,4 @@
 /* Define this if your system supports anonymous memory maps (linux does) */
 #define MMAP_ANONYMOUS
 
-/* Configuration options */
+#endif

Modified: branches/new_build/build/ode.lua
===================================================================
--- branches/new_build/build/ode.lua	2006-03-23 00:54:04 UTC (rev 868)
+++ branches/new_build/build/ode.lua	2006-03-23 20:20:28 UTC (rev 869)
@@ -6,40 +6,45 @@
 
 -- Write a custom <config.h> to include/ode, based on the specified flags
 
-  os.copyfile("config.in", "../include/ode/config.h")
-  local f = io.open("../include/ode/config.h", "a")
-
+  io.input("config.in")
+  local text = io.read("*a")
+  
   if (options["with-doubles"]) then
-    f:write("#define dDOUBLE 1\n")
-    f:write("#define dInfinity ODE_INFINITY8\n")
-    f:write("#define dEpsilon DBL_EPSILON\n")
+    text = string.gsub(text, "{PRECISION}", "dDOUBLE")
   else
-    f:write("#define dSINGLE 1\n")
-    f:write("#define dInfinity ODE_INFINITY4\n")
-    f:write("#define dEpsilon FLT_EPSILON\n")
+    text = string.gsub(text, "{PRECISION}", "dSINGLE")
   end
-
-  if (not options["no-cylinder"]) then
-    f:write("#define dCYLINDER_ENABLED 1\n")
-  end
   
-  if (not options["no-trimesh"]) then
-    f:write("#define dTRIMESH_ENABLED 1\n")
+  if (options["no-cylinder"]) then
+    text = string.gsub(text, "{CYLINDER}", "0")
+  else
+    text = string.gsub(text, "{CYLINDER}", "1")
   end
+    
+  if (options["no-trimesh"]) then
+    text = string.gsub(text, "{TRIMESH}", "0")
+  else
+    text = string.gsub(text, "{TRIMESH}", "1")
+  end
+    
+  io.output("../include/ode/config.h")
+  io.write(text)
+  io.close()
 
-  f:write("\n#endif\n")	
-  f:close()
-
   
 -- Package Build Settings
 
-  if (options["enable-static"]) then
-    package.kind = "lib"
-  else
-    package.kind = "dll"
-    table.insert(package.defines, "ODE_DLL_EXPORT")
-  end
+  package.config["DebugDLL"].kind = "dll"
+  package.config["DebugLib"].kind = "lib"
+  package.config["ReleaseDLL"].kind = "dll"
+  package.config["ReleaseLib"].kind = "lib"
+
+  table.insert(package.config["DebugDLL"].defines, "ODE_DLL")
+  table.insert(package.config["ReleaseDLL"].defines, "ODE_DLL")
   
+  table.insert(package.config["DebugLib"].defines, "ODE_LIB")
+  table.insert(package.config["ReleaseLib"].defines, "ODE_LIB")
+  
   package.includepaths =
   {
     "../../include",

Modified: branches/new_build/build/premake.lua
===================================================================
--- branches/new_build/build/premake.lua	2006-03-23 00:54:04 UTC (rev 868)
+++ branches/new_build/build/premake.lua	2006-03-23 20:20:28 UTC (rev 869)
@@ -1,5 +1,8 @@
 project.name = "ode"
 
+project.configs = { "DebugDLL", "ReleaseDLL", "DebugLib", "ReleaseLib" }
+
+
 -- Project options
 
   addoption("enable-static", "Build ODE as a static library instead of a DLL")
@@ -24,11 +27,17 @@
 
 -- Set the output directories
 
-  project.config["Debug"].bindir = "../lib/debug"
-  project.config["Debug"].libdir = "../lib/debug"
+  project.config["DebugDLL"].bindir = "../lib/DebugDLL"
+  project.config["DebugDLL"].libdir = "../lib/DebugDLL"
 
-  project.config["Release"].bindir = "../lib/release"
-  project.config["Release"].libdir = "../lib/release"
+  project.config["ReleaseDLL"].bindir = "../lib/ReleaseDLL"
+  project.config["ReleaseDLL"].libdir = "../lib/ReleaseDLL"
+
+  project.config["DebugLib"].bindir = "../lib/DebugLib"
+  project.config["DebugLib"].libdir = "../lib/DebugLib"
+
+  project.config["ReleaseLib"].bindir = "../lib/ReleaseLib"
+  project.config["ReleaseLib"].libdir = "../lib/ReleaseLib"
   
 
 -- Build packages

Modified: branches/new_build/build/tests.lua
===================================================================
--- branches/new_build/build/tests.lua	2006-03-23 00:54:04 UTC (rev 868)
+++ branches/new_build/build/tests.lua	2006-03-23 20:20:28 UTC (rev 869)
@@ -10,6 +10,8 @@
     "../../include"
   }
   
+  package.defines = { "_CRT_SECURE_NO_DEPRECATE" }
+
   package.files = 
   {
     matchfiles("../../include/drawstuff/*.h"),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [868] branches/new_build/build

[<jas...@us...>]

Revision: 868
Author:   jason379
Date:     2006-03-22 16:54:04 -0800 (Wed, 22 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=868&view=rev

Log Message:
-----------
Tweaks to premake scripts to get it working with VC6

Modified Paths:
--------------
    branches/new_build/build/ode.lua
    branches/new_build/build/tests.lua
    branches/new_build/build/vs2002/drawstuff.vcproj
    branches/new_build/build/vs2002/ode.sln
    branches/new_build/build/vs2002/ode.vcproj
    branches/new_build/build/vs2002/test_I.vcproj
    branches/new_build/build/vs2002/test_boxstack.vcproj
    branches/new_build/build/vs2002/test_buggy.vcproj
    branches/new_build/build/vs2002/test_chain1.vcproj
    branches/new_build/build/vs2002/test_chain2.vcproj
    branches/new_build/build/vs2002/test_collision.vcproj
    branches/new_build/build/vs2002/test_crash.vcproj
    branches/new_build/build/vs2002/test_cyl.vcproj
    branches/new_build/build/vs2002/test_friction.vcproj
    branches/new_build/build/vs2002/test_hinge.vcproj
    branches/new_build/build/vs2002/test_joints.vcproj
    branches/new_build/build/vs2002/test_moving_trimesh.vcproj
    branches/new_build/build/vs2002/test_ode.vcproj
    branches/new_build/build/vs2002/test_slider.vcproj
    branches/new_build/build/vs2002/test_space.vcproj
    branches/new_build/build/vs2002/test_space_stress.vcproj
    branches/new_build/build/vs2002/test_step.vcproj
    branches/new_build/build/vs2002/test_trimesh.vcproj
    branches/new_build/build/vs2002/tests.vcproj
    branches/new_build/build/vs2003/drawstuff.vcproj
    branches/new_build/build/vs2003/ode.sln
    branches/new_build/build/vs2003/ode.vcproj
    branches/new_build/build/vs2003/test_I.vcproj
    branches/new_build/build/vs2003/test_boxstack.vcproj
    branches/new_build/build/vs2003/test_buggy.vcproj
    branches/new_build/build/vs2003/test_chain1.vcproj
    branches/new_build/build/vs2003/test_chain2.vcproj
    branches/new_build/build/vs2003/test_collision.vcproj
    branches/new_build/build/vs2003/test_crash.vcproj
    branches/new_build/build/vs2003/test_cyl.vcproj
    branches/new_build/build/vs2003/test_friction.vcproj
    branches/new_build/build/vs2003/test_hinge.vcproj
    branches/new_build/build/vs2003/test_joints.vcproj
    branches/new_build/build/vs2003/test_moving_trimesh.vcproj
    branches/new_build/build/vs2003/test_ode.vcproj
    branches/new_build/build/vs2003/test_slider.vcproj
    branches/new_build/build/vs2003/test_space.vcproj
    branches/new_build/build/vs2003/test_space_stress.vcproj
    branches/new_build/build/vs2003/test_step.vcproj
    branches/new_build/build/vs2003/test_trimesh.vcproj
    branches/new_build/build/vs2003/tests.vcproj
    branches/new_build/build/vs2005/drawstuff.vcproj
    branches/new_build/build/vs2005/ode.sln
    branches/new_build/build/vs2005/ode.vcproj
    branches/new_build/build/vs2005/test_I.vcproj
    branches/new_build/build/vs2005/test_boxstack.vcproj
    branches/new_build/build/vs2005/test_buggy.vcproj
    branches/new_build/build/vs2005/test_chain1.vcproj
    branches/new_build/build/vs2005/test_chain2.vcproj
    branches/new_build/build/vs2005/test_collision.vcproj
    branches/new_build/build/vs2005/test_crash.vcproj
    branches/new_build/build/vs2005/test_cyl.vcproj
    branches/new_build/build/vs2005/test_friction.vcproj
    branches/new_build/build/vs2005/test_hinge.vcproj
    branches/new_build/build/vs2005/test_joints.vcproj
    branches/new_build/build/vs2005/test_moving_trimesh.vcproj
    branches/new_build/build/vs2005/test_ode.vcproj
    branches/new_build/build/vs2005/test_slider.vcproj
    branches/new_build/build/vs2005/test_space.vcproj
    branches/new_build/build/vs2005/test_space_stress.vcproj
    branches/new_build/build/vs2005/test_step.vcproj
    branches/new_build/build/vs2005/test_trimesh.vcproj
    branches/new_build/build/vs2005/tests.vcproj
    branches/new_build/build/vs6/ode.dsp
    branches/new_build/build/vs6/test_I.dsp
    branches/new_build/build/vs6/test_boxstack.dsp
    branches/new_build/build/vs6/test_buggy.dsp
    branches/new_build/build/vs6/test_chain1.dsp
    branches/new_build/build/vs6/test_chain2.dsp
    branches/new_build/build/vs6/test_collision.dsp
    branches/new_build/build/vs6/test_crash.dsp
    branches/new_build/build/vs6/test_cyl.dsp
    branches/new_build/build/vs6/test_friction.dsp
    branches/new_build/build/vs6/test_hinge.dsp
    branches/new_build/build/vs6/test_joints.dsp
    branches/new_build/build/vs6/test_moving_trimesh.dsp
    branches/new_build/build/vs6/test_ode.dsp
    branches/new_build/build/vs6/test_slider.dsp
    branches/new_build/build/vs6/test_space.dsp
    branches/new_build/build/vs6/test_space_stress.dsp
    branches/new_build/build/vs6/test_step.dsp
    branches/new_build/build/vs6/test_trimesh.dsp
    branches/new_build/build/vs6/tests.dsp
Modified: branches/new_build/build/ode.lua
===================================================================
--- branches/new_build/build/ode.lua	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/ode.lua	2006-03-23 00:54:04 UTC (rev 868)
@@ -55,7 +55,14 @@
     table.insert(package.defines, "_CRT_SECURE_NO_DEPRECATE")
   end
   
-  
+
+-- Libraries
+
+  if (windows) then
+    table.insert(package.links, "user32")
+  end
+
+    
 -- Files
 
   core_files =

Modified: branches/new_build/build/tests.lua
===================================================================
--- branches/new_build/build/tests.lua	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/tests.lua	2006-03-23 00:54:04 UTC (rev 868)
@@ -42,7 +42,7 @@
 	
     package.links = { "ode", "drawstuff" }
     if (windows) then
-      table.insert(package.links, { "gdi32", "opengl32", "glu32" })
+      table.insert(package.links, { "user32", "gdi32", "opengl32", "glu32" })
     else
       table.insert(package.links, { "GL", "GLU" })
     end

Modified: branches/new_build/build/vs2002/drawstuff.vcproj
===================================================================
--- branches/new_build/build/vs2002/drawstuff.vcproj	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/drawstuff.vcproj	2006-03-23 00:54:04 UTC (rev 868)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="drawstuff"
-	ProjectGUID="{EB226AE6-4232-8949-94AA-C1F6E1E0322D}"
+	ProjectGUID="{51C0AC05-C120-D345-A352-DE8B50F09DE7}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform

Modified: branches/new_build/build/vs2002/ode.sln
===================================================================
--- branches/new_build/build/vs2002/ode.sln	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/ode.sln	2006-03-23 00:54:04 UTC (rev 868)
@@ -1,45 +1,45 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{86863941-B112-E444-9025-62914728B232}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{EB226AE6-4232-8949-94AA-C1F6E1E0322D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{51C0AC05-C120-D345-A352-DE8B50F09DE7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{CBCCCF87-9F41-494D-800D-0A2563A477AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{A337A401-E2A4-B340-8D96-0094B8197436}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{6A45A4A7-CE88-C641-B817-F081F91BE1DC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{1C8279B9-F67C-B945-A889-38EC210EDD6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{3CECFF90-B7EB-C24A-8FAC-518C5D3EEE7B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{D9B23F76-E5F9-4445-8A0B-40812467ED27}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{3726E3B1-6FA3-9846-8545-B285E9127FDE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{A7DDBFD8-5102-DD42-B0D1-83FC4107B4DD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{091F7848-1A66-544D-BDE9-88E67B8AE6A7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{F0CF4312-C444-A442-B92C-116AA1161143}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{E658F4EA-7900-8044-8C32-D07DBAD35DB5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{57582667-3688-414E-B7D2-43A9607C42E1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_I", "./test_I.vcproj", "{531A7AD1-2589-BE42-96B0-1686543EBC86}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_I", "./test_I.vcproj", "{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_joints", "./test_joints.vcproj", "{DA94F34F-E7CA-484C-8A33-8E00CA237116}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_joints", "./test_joints.vcproj", "{C781679D-837E-A44B-A03F-C05B423651CE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ode", "./test_ode.vcproj", "{A9784F09-498F-194E-96DF-47185D05CC0C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ode", "./test_ode.vcproj", "{5F6B11F0-4E09-B142-A302-2BB6CCBCA04B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_slider", "./test_slider.vcproj", "{15972BB0-7EA1-B24B-975F-5D0AEBD45224}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_slider", "./test_slider.vcproj", "{6ABE4F39-B884-A14A-A99F-0361F9858E81}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space", "./test_space.vcproj", "{0868390D-2298-484F-BE0A-A767FBA35014}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space", "./test_space.vcproj", "{4D87F654-0235-2F48-BEA0-B51512ABBB17}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space_stress", "./test_space_stress.vcproj", "{3F177A7C-92B8-BB4E-B414-D892C2B5266B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space_stress", "./test_space_stress.vcproj", "{5024C625-4419-A04F-BFC9-A8164E5CB97E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_step", "./test_step.vcproj", "{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_step", "./test_step.vcproj", "{28CDE6FE-B98F-1C4F-846A-60682FCFD352}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyl", "./test_cyl.vcproj", "{BF5BC703-2F23-EF4A-850D-09BF66542A42}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyl", "./test_cyl.vcproj", "{C94A51FD-5203-9046-B869-9CA986CB2672}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_moving_trimesh", "./test_moving_trimesh.vcproj", "{F54FB367-9897-3941-9787-20134FAF6B1F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_moving_trimesh", "./test_moving_trimesh.vcproj", "{4DF5FBEB-E290-2A4D-A4A2-28FEE604732E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_trimesh", "./test_trimesh.vcproj", "{DFE3CE67-3550-8F44-996E-B5302D9A14FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_trimesh", "./test_trimesh.vcproj", "{AEC393F9-8A03-7840-B1CE-9D0443638F50}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "./tests.vcproj", "{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "./tests.vcproj", "{CE480323-7692-2541-988F-FC06C9BCD4E0}"
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
@@ -47,129 +47,129 @@
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{A337A401-E2A4-B340-8D96-0094B8197436}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{A337A401-E2A4-B340-8D96-0094B8197436}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{531A7AD1-2589-BE42-96B0-1686543EBC86}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{531A7AD1-2589-BE42-96B0-1686543EBC86}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{A9784F09-498F-194E-96DF-47185D05CC0C}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{A9784F09-498F-194E-96DF-47185D05CC0C}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{0868390D-2298-484F-BE0A-A767FBA35014}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{0868390D-2298-484F-BE0A-A767FBA35014}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{F54FB367-9897-3941-9787-20134FAF6B1F}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{F54FB367-9897-3941-9787-20134FAF6B1F}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
-		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
-		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}.0 = {86863941-B112-E444-9025-62914728B232}
+		{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}.0 = {86863941-B112-E444-9025-62914728B232}
+		{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}.0 = {86863941-B112-E444-9025-62914728B232}
+		{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{3CECFF90-B7EB-C24A-8FAC-518C5D3EEE7B}.0 = {86863941-B112-E444-9025-62914728B232}
+		{3CECFF90-B7EB-C24A-8FAC-518C5D3EEE7B}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{3726E3B1-6FA3-9846-8545-B285E9127FDE}.0 = {86863941-B112-E444-9025-62914728B232}
+		{3726E3B1-6FA3-9846-8545-B285E9127FDE}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{A7DDBFD8-5102-DD42-B0D1-83FC4107B4DD}.0 = {86863941-B112-E444-9025-62914728B232}
+		{A7DDBFD8-5102-DD42-B0D1-83FC4107B4DD}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{F0CF4312-C444-A442-B92C-116AA1161143}.0 = {86863941-B112-E444-9025-62914728B232}
+		{F0CF4312-C444-A442-B92C-116AA1161143}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{57582667-3688-414E-B7D2-43A9607C42E1}.0 = {86863941-B112-E444-9025-62914728B232}
+		{57582667-3688-414E-B7D2-43A9607C42E1}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}.0 = {86863941-B112-E444-9025-62914728B232}
+		{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{C781679D-837E-A44B-A03F-C05B423651CE}.0 = {86863941-B112-E444-9025-62914728B232}
+		{C781679D-837E-A44B-A03F-C05B423651CE}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{5F6B11F0-4E09-B142-A302-2BB6CCBCA04B}.0 = {86863941-B112-E444-9025-62914728B232}
+		{5F6B11F0-4E09-B142-A302-2BB6CCBCA04B}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{6ABE4F39-B884-A14A-A99F-0361F9858E81}.0 = {86863941-B112-E444-9025-62914728B232}
+		{6ABE4F39-B884-A14A-A99F-0361F9858E81}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{4D87F654-0235-2F48-BEA0-B51512ABBB17}.0 = {86863941-B112-E444-9025-62914728B232}
+		{4D87F654-0235-2F48-BEA0-B51512ABBB17}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{5024C625-4419-A04F-BFC9-A8164E5CB97E}.0 = {86863941-B112-E444-9025-62914728B232}
+		{5024C625-4419-A04F-BFC9-A8164E5CB97E}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{28CDE6FE-B98F-1C4F-846A-60682FCFD352}.0 = {86863941-B112-E444-9025-62914728B232}
+		{28CDE6FE-B98F-1C4F-846A-60682FCFD352}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{C94A51FD-5203-9046-B869-9CA986CB2672}.0 = {86863941-B112-E444-9025-62914728B232}
+		{C94A51FD-5203-9046-B869-9CA986CB2672}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{4DF5FBEB-E290-2A4D-A4A2-28FEE604732E}.0 = {86863941-B112-E444-9025-62914728B232}
+		{4DF5FBEB-E290-2A4D-A4A2-28FEE604732E}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{AEC393F9-8A03-7840-B1CE-9D0443638F50}.0 = {86863941-B112-E444-9025-62914728B232}
+		{AEC393F9-8A03-7840-B1CE-9D0443638F50}.1 = {51C0AC05-C120-D345-A352-DE8B50F09DE7}
+		{CE480323-7692-2541-988F-FC06C9BCD4E0}.0 = {86863941-B112-E444-9025-62914728B232}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Debug.ActiveCfg = Debug|Win32
-		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Debug.Build.0 = Debug|Win32
-		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Release.ActiveCfg = Release|Win32
-		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Release.Build.0 = Release|Win32
-		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Debug.ActiveCfg = Debug|Win32
-		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Debug.Build.0 = Debug|Win32
-		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Release.ActiveCfg = Release|Win32
-		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Release.Build.0 = Release|Win32
-		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Debug.ActiveCfg = Debug|Win32
-		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Debug.Build.0 = Debug|Win32
-		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Release.ActiveCfg = Release|Win32
-		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Release.Build.0 = Release|Win32
-		{A337A401-E2A4-B340-8D96-0094B8197436}.Debug.ActiveCfg = Debug|Win32
-		{A337A401-E2A4-B340-8D96-0094B8197436}.Debug.Build.0 = Debug|Win32
-		{A337A401-E2A4-B340-8D96-0094B8197436}.Release.ActiveCfg = Release|Win32
-		{A337A401-E2A4-B340-8D96-0094B8197436}.Release.Build.0 = Release|Win32
-		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Debug.ActiveCfg = Debug|Win32
-		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Debug.Build.0 = Debug|Win32
-		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Release.ActiveCfg = Release|Win32
-		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Release.Build.0 = Release|Win32
-		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Debug.ActiveCfg = Debug|Win32
-		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Debug.Build.0 = Debug|Win32
-		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Release.ActiveCfg = Release|Win32
-		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Release.Build.0 = Release|Win32
-		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Debug.ActiveCfg = Debug|Win32
-		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Debug.Build.0 = Debug|Win32
-		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Release.ActiveCfg = Release|Win32
-		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Release.Build.0 = Release|Win32
-		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Debug.ActiveCfg = Debug|Win32
-		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Debug.Build.0 = Debug|Win32
-		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Release.ActiveCfg = Release|Win32
-		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Release.Build.0 = Release|Win32
-		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Debug.ActiveCfg = Debug|Win32
-		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Debug.Build.0 = Debug|Win32
-		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Release.ActiveCfg = Release|Win32
-		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Release.Build.0 = Release|Win32
-		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Debug.ActiveCfg = Debug|Win32
-		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Debug.Build.0 = Debug|Win32
-		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Release.ActiveCfg = Release|Win32
-		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Release.Build.0 = Release|Win32
-		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Debug.ActiveCfg = Debug|Win32
-		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Debug.Build.0 = Debug|Win32
-		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Release.ActiveCfg = Release|Win32
-		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Release.Build.0 = Release|Win32
-		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Debug.ActiveCfg = Debug|Win32
-		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Debug.Build.0 = Debug|Win32
-		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Release.ActiveCfg = Release|Win32
-		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Release.Build.0 = Release|Win32
-		{A9784F09-498F-194E-96DF-47185D05CC0C}.Debug.ActiveCfg = Debug|Win32
-		{A9784F09-498F-194E-96DF-47185D05CC0C}.Debug.Build.0 = Debug|Win32
-		{A9784F09-498F-194E-96DF-47185D05CC0C}.Release.ActiveCfg = Release|Win32
-		{A9784F09-498F-194E-96DF-47185D05CC0C}.Release.Build.0 = Release|Win32
-		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Debug.ActiveCfg = Debug|Win32
-		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Debug.Build.0 = Debug|Win32
-		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Release.ActiveCfg = Release|Win32
-		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Release.Build.0 = Release|Win32
-		{0868390D-2298-484F-BE0A-A767FBA35014}.Debug.ActiveCfg = Debug|Win32
-		{0868390D-2298-484F-BE0A-A767FBA35014}.Debug.Build.0 = Debug|Win32
-		{0868390D-2298-484F-BE0A-A767FBA35014}.Release.ActiveCfg = Release|Win32
-		{0868390D-2298-484F-BE0A-A767FBA35014}.Release.Build.0 = Release|Win32
-		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Debug.ActiveCfg = Debug|Win32
-		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Debug.Build.0 = Debug|Win32
-		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Release.ActiveCfg = Release|Win32
-		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Release.Build.0 = Release|Win32
-		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Debug.ActiveCfg = Debug|Win32
-		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Debug.Build.0 = Debug|Win32
-		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Release.ActiveCfg = Release|Win32
-		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Release.Build.0 = Release|Win32
-		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Debug.ActiveCfg = Debug|Win32
-		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Debug.Build.0 = Debug|Win32
-		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Release.ActiveCfg = Release|Win32
-		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Release.Build.0 = Release|Win32
-		{F54FB367-9897-3941-9787-20134FAF6B1F}.Debug.ActiveCfg = Debug|Win32
-		{F54FB367-9897-3941-9787-20134FAF6B1F}.Debug.Build.0 = Debug|Win32
-		{F54FB367-9897-3941-9787-20134FAF6B1F}.Release.ActiveCfg = Release|Win32
-		{F54FB367-9897-3941-9787-20134FAF6B1F}.Release.Build.0 = Release|Win32
-		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Debug.ActiveCfg = Debug|Win32
-		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Debug.Build.0 = Debug|Win32
-		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Release.ActiveCfg = Release|Win32
-		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Release.Build.0 = Release|Win32
-		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Debug.ActiveCfg = Debug|Win32
-		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Debug.Build.0 = Debug|Win32
-		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Release.ActiveCfg = Release|Win32
-		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Release.Build.0 = Release|Win32
+		{86863941-B112-E444-9025-62914728B232}.Debug.ActiveCfg = Debug|Win32
+		{86863941-B112-E444-9025-62914728B232}.Debug.Build.0 = Debug|Win32
+		{86863941-B112-E444-9025-62914728B232}.Release.ActiveCfg = Release|Win32
+		{86863941-B112-E444-9025-62914728B232}.Release.Build.0 = Release|Win32
+		{51C0AC05-C120-D345-A352-DE8B50F09DE7}.Debug.ActiveCfg = Debug|Win32
+		{51C0AC05-C120-D345-A352-DE8B50F09DE7}.Debug.Build.0 = Debug|Win32
+		{51C0AC05-C120-D345-A352-DE8B50F09DE7}.Release.ActiveCfg = Release|Win32
+		{51C0AC05-C120-D345-A352-DE8B50F09DE7}.Release.Build.0 = Release|Win32
+		{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}.Debug.ActiveCfg = Debug|Win32
+		{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}.Debug.Build.0 = Debug|Win32
+		{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}.Release.ActiveCfg = Release|Win32
+		{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}.Release.Build.0 = Release|Win32
+		{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}.Debug.ActiveCfg = Debug|Win32
+		{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}.Debug.Build.0 = Debug|Win32
+		{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}.Release.ActiveCfg = Release|Win32
+		{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}.Release.Build.0 = Release|Win32
+		{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}.Debug.ActiveCfg = Debug|Win32
+		{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}.Debug.Build.0 = Debug|Win32
+		{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}.Release.ActiveCfg = Release|Win32
+		{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}.Release.Build.0 = Release|Win32
+		{3CECFF90-B7EB-C24A-8FAC-518C5D3EEE7B}.Debug.ActiveCfg = Debug|Win32
+		{3CECFF90-B7EB-C24A-8FAC-518C5D3EEE7B}.Debug.Build.0 = Debug|Win32
+		{3CECFF90-B7EB-C24A-8FAC-518C5D3EEE7B}.Release.ActiveCfg = Release|Win32
+		{3CECFF90-B7EB-C24A-8FAC-518C5D3EEE7B}.Release.Build.0 = Release|Win32
+		{3726E3B1-6FA3-9846-8545-B285E9127FDE}.Debug.ActiveCfg = Debug|Win32
+		{3726E3B1-6FA3-9846-8545-B285E9127FDE}.Debug.Build.0 = Debug|Win32
+		{3726E3B1-6FA3-9846-8545-B285E9127FDE}.Release.ActiveCfg = Release|Win32
+		{3726E3B1-6FA3-9846-8545-B285E9127FDE}.Release.Build.0 = Release|Win32
+		{A7DDBFD8-5102-DD42-B0D1-83FC4107B4DD}.Debug.ActiveCfg = Debug|Win32
+		{A7DDBFD8-5102-DD42-B0D1-83FC4107B4DD}.Debug.Build.0 = Debug|Win32
+		{A7DDBFD8-5102-DD42-B0D1-83FC4107B4DD}.Release.ActiveCfg = Release|Win32
+		{A7DDBFD8-5102-DD42-B0D1-83FC4107B4DD}.Release.Build.0 = Release|Win32
+		{F0CF4312-C444-A442-B92C-116AA1161143}.Debug.ActiveCfg = Debug|Win32
+		{F0CF4312-C444-A442-B92C-116AA1161143}.Debug.Build.0 = Debug|Win32
+		{F0CF4312-C444-A442-B92C-116AA1161143}.Release.ActiveCfg = Release|Win32
+		{F0CF4312-C444-A442-B92C-116AA1161143}.Release.Build.0 = Release|Win32
+		{57582667-3688-414E-B7D2-43A9607C42E1}.Debug.ActiveCfg = Debug|Win32
+		{57582667-3688-414E-B7D2-43A9607C42E1}.Debug.Build.0 = Debug|Win32
+		{57582667-3688-414E-B7D2-43A9607C42E1}.Release.ActiveCfg = Release|Win32
+		{57582667-3688-414E-B7D2-43A9607C42E1}.Release.Build.0 = Release|Win32
+		{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}.Debug.ActiveCfg = Debug|Win32
+		{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}.Debug.Build.0 = Debug|Win32
+		{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}.Release.ActiveCfg = Release|Win32
+		{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}.Release.Build.0 = Release|Win32
+		{C781679D-837E-A44B-A03F-C05B423651CE}.Debug.ActiveCfg = Debug|Win32
+		{C781679D-837E-A44B-A03F-C05B423651CE}.Debug.Build.0 = Debug|Win32
+		{C781679D-837E-A44B-A03F-C05B423651CE}.Release.ActiveCfg = Release|Win32
+		{C781679D-837E-A44B-A03F-C05B423651CE}.Release.Build.0 = Release|Win32
+		{5F6B11F0-4E09-B142-A302-2BB6CCBCA04B}.Debug.ActiveCfg = Debug|Win32
+		{5F6B11F0-4E09-B142-A302-2BB6CCBCA04B}.Debug.Build.0 = Debug|Win32
+		{5F6B11F0-4E09-B142-A302-2BB6CCBCA04B}.Release.ActiveCfg = Release|Win32
+		{5F6B11F0-4E09-B142-A302-2BB6CCBCA04B}.Release.Build.0 = Release|Win32
+		{6ABE4F39-B884-A14A-A99F-0361F9858E81}.Debug.ActiveCfg = Debug|Win32
+		{6ABE4F39-B884-A14A-A99F-0361F9858E81}.Debug.Build.0 = Debug|Win32
+		{6ABE4F39-B884-A14A-A99F-0361F9858E81}.Release.ActiveCfg = Release|Win32
+		{6ABE4F39-B884-A14A-A99F-0361F9858E81}.Release.Build.0 = Release|Win32
+		{4D87F654-0235-2F48-BEA0-B51512ABBB17}.Debug.ActiveCfg = Debug|Win32
+		{4D87F654-0235-2F48-BEA0-B51512ABBB17}.Debug.Build.0 = Debug|Win32
+		{4D87F654-0235-2F48-BEA0-B51512ABBB17}.Release.ActiveCfg = Release|Win32
+		{4D87F654-0235-2F48-BEA0-B51512ABBB17}.Release.Build.0 = Release|Win32
+		{5024C625-4419-A04F-BFC9-A8164E5CB97E}.Debug.ActiveCfg = Debug|Win32
+		{5024C625-4419-A04F-BFC9-A8164E5CB97E}.Debug.Build.0 = Debug|Win32
+		{5024C625-4419-A04F-BFC9-A8164E5CB97E}.Release.ActiveCfg = Release|Win32
+		{5024C625-4419-A04F-BFC9-A8164E5CB97E}.Release.Build.0 = Release|Win32
+		{28CDE6FE-B98F-1C4F-846A-60682FCFD352}.Debug.ActiveCfg = Debug|Win32
+		{28CDE6FE-B98F-1C4F-846A-60682FCFD352}.Debug.Build.0 = Debug|Win32
+		{28CDE6FE-B98F-1C4F-846A-60682FCFD352}.Release.ActiveCfg = Release|Win32
+		{28CDE6FE-B98F-1C4F-846A-60682FCFD352}.Release.Build.0 = Release|Win32
+		{C94A51FD-5203-9046-B869-9CA986CB2672}.Debug.ActiveCfg = Debug|Win32
+		{C94A51FD-5203-9046-B869-9CA986CB2672}.Debug.Build.0 = Debug|Win32
+		{C94A51FD-5203-9046-B869-9CA986CB2672}.Release.ActiveCfg = Release|Win32
+		{C94A51FD-5203-9046-B869-9CA986CB2672}.Release.Build.0 = Release|Win32
+		{4DF5FBEB-E290-2A4D-A4A2-28FEE604732E}.Debug.ActiveCfg = Debug|Win32
+		{4DF5FBEB-E290-2A4D-A4A2-28FEE604732E}.Debug.Build.0 = Debug|Win32
+		{4DF5FBEB-E290-2A4D-A4A2-28FEE604732E}.Release.ActiveCfg = Release|Win32
+		{4DF5FBEB-E290-2A4D-A4A2-28FEE604732E}.Release.Build.0 = Release|Win32
+		{AEC393F9-8A03-7840-B1CE-9D0443638F50}.Debug.ActiveCfg = Debug|Win32
+		{AEC393F9-8A03-7840-B1CE-9D0443638F50}.Debug.Build.0 = Debug|Win32
+		{AEC393F9-8A03-7840-B1CE-9D0443638F50}.Release.ActiveCfg = Release|Win32
+		{AEC393F9-8A03-7840-B1CE-9D0443638F50}.Release.Build.0 = Release|Win32
+		{CE480323-7692-2541-988F-FC06C9BCD4E0}.Debug.ActiveCfg = Debug|Win32
+		{CE480323-7692-2541-988F-FC06C9BCD4E0}.Debug.Build.0 = Debug|Win32
+		{CE480323-7692-2541-988F-FC06C9BCD4E0}.Release.ActiveCfg = Release|Win32
+		{CE480323-7692-2541-988F-FC06C9BCD4E0}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: branches/new_build/build/vs2002/ode.vcproj
===================================================================
--- branches/new_build/build/vs2002/ode.vcproj	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/ode.vcproj	2006-03-23 00:54:04 UTC (rev 868)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="ode"
-	ProjectGUID="{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}"
+	ProjectGUID="{86863941-B112-E444-9025-62914728B232}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -34,6 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				OutputFile="$(OutDir)/ode.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../lib/debug"
@@ -81,6 +82,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib"
 				OutputFile="$(OutDir)/ode.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../lib/release"
@@ -115,67 +117,67 @@
 				Name="ode"
 				Filter="">
 				<File
-					RelativePath="..\..\include\ode\collision.h">
+					RelativePath="..\..\include\ode\objects.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\collision_space.h">
+					RelativePath="..\..\include\ode\error.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\collision_trimesh.h">
+					RelativePath="..\..\include\ode\misc.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\common.h">
+					RelativePath="..\..\include\ode\contact.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\compatibility.h">
+					RelativePath="..\..\include\ode\collision.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\config.h">
+					RelativePath="..\..\include\ode\rotation.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\contact.h">
+					RelativePath="..\..\include\ode\mass.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\error.h">
+					RelativePath="..\..\include\ode\matrix.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\export-dif.h">
+					RelativePath="..\..\include\ode\collision_space.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\mass.h">
+					RelativePath="..\..\include\ode\ode.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\matrix.h">
+					RelativePath="..\..\include\ode\memory.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\memory.h">
+					RelativePath="..\..\include\ode\odecpp_old.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\misc.h">
+					RelativePath="..\..\include\ode\compatibility.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\objects.h">
+					RelativePath="..\..\include\ode\odecpp.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\ode.h">
+					RelativePath="..\..\include\ode\timer.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\odecpp.h">
+					RelativePath="..\..\include\ode\export-dif.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\odecpp_collision.h">
+					RelativePath="..\..\include\ode\odemath.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\odecpp_old.h">
+					RelativePath="..\..\include\ode\odecpp_collision.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\odemath.h">
+					RelativePath="..\..\include\ode\collision_trimesh.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\rotation.h">
+					RelativePath="..\..\include\ode\common.h">
 				</File>
 				<File
-					RelativePath="..\..\include\ode\timer.h">
+					RelativePath="..\..\include\ode\config.h">
 				</File>
 			</Filter>
 		</Filter>
@@ -186,58 +188,61 @@
 				Name="src"
 				Filter="">
 				<File
-					RelativePath="..\..\ode\src\array.h">
+					RelativePath="..\..\ode\src\collision_space_internal.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_kernel.h">
+					RelativePath="..\..\ode\src\collision_std.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_space_internal.h">
+					RelativePath="..\..\ode\src\stack.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_std.h">
+					RelativePath="..\..\ode\src\step.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_transform.h">
+					RelativePath="..\..\ode\src\util.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh_internal.h">
+					RelativePath="..\..\ode\src\array.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_util.h">
+					RelativePath="..\..\ode\src\collision_trimesh_internal.h">
 				</File>
 				<File
 					RelativePath="..\..\ode\src\joint.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\lcp.h">
+					RelativePath="..\..\ode\src\collision_transform.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\mat.h">
+					RelativePath="..\..\ode\src\obstack.h">
 				</File>
 				<File
+					RelativePath="..\..\ode\src\collision_util.h">
+				</File>
+				<File
 					RelativePath="..\..\ode\src\objects.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\obstack.h">
+					RelativePath="..\..\ode\src\collision_kernel.h">
 				</File>
 				<File
 					RelativePath="..\..\ode\src\quickstep.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\stack.h">
+					RelativePath="..\..\ode\src\testing.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\step.h">
+					RelativePath="..\..\ode\src\lcp.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\testing.h">
+					RelativePath="..\..\ode\src\mat.h">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\util.h">
+					RelativePath="..\..\ode\src\fastdot.c">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\fastdot.c">
+					RelativePath="..\..\ode\src\fastltsolve.c">
 				</File>
 				<File
 					RelativePath="..\..\ode\src\fastldlt.c">
@@ -246,119 +251,116 @@
 					RelativePath="..\..\ode\src\fastlsolve.c">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\fastltsolve.c">
+					RelativePath="..\..\ode\src\collision_trimesh_box.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\array.cpp">
+					RelativePath="..\..\ode\src\rotation.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_cylinder_box.cpp">
+					RelativePath="..\..\ode\src\collision_trimesh_distance.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_cylinder_plane.cpp">
+					RelativePath="..\..\ode\src\collision_trimesh_ray.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_cylinder_sphere.cpp">
+					RelativePath="..\..\ode\src\matrix.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_cylinder_trimesh.cpp">
+					RelativePath="..\..\ode\src\collision_space.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_kernel.cpp">
+					RelativePath="..\..\ode\src\memory.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_quadtreespace.cpp">
+					RelativePath="..\..\ode\src\quickstep.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_space.cpp">
+					RelativePath="..\..\ode\src\testing.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_std.cpp">
+					RelativePath="..\..\ode\src\lcp.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_transform.cpp">
+					RelativePath="..\..\ode\src\collision_cylinder_trimesh.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh.cpp">
+					RelativePath="..\..\ode\src\timer.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh_box.cpp">
+					RelativePath="..\..\ode\src\export-dif.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh_ccylinder.cpp">
+					RelativePath="..\..\ode\src\collision_trimesh_trimesh.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh_distance.cpp">
+					RelativePath="..\..\ode\src\mat.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh_ray.cpp">
+					RelativePath="..\..\ode\src\collision_trimesh_ccylinder.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh_sphere.cpp">
+					RelativePath="..\..\ode\src\collision_trimesh.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_trimesh_trimesh.cpp">
+					RelativePath="..\..\ode\src\misc.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\collision_util.cpp">
+					RelativePath="..\..\ode\src\collision_quadtreespace.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\error.cpp">
+					RelativePath="..\..\ode\src\collision_cylinder_plane.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\export-dif.cpp">
+					RelativePath="..\..\ode\src\mass.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\joint.cpp">
+					RelativePath="..\..\ode\src\collision_std.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\lcp.cpp">
+					RelativePath="..\..\ode\src\ode.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\mass.cpp">
+					RelativePath="..\..\ode\src\step.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\mat.cpp">
+					RelativePath="..\..\ode\src\util.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\matrix.cpp">
+					RelativePath="..\..\ode\src\array.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\memory.cpp">
+					RelativePath="..\..\ode\src\odemath.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\misc.cpp">
+					RelativePath="..\..\ode\src\joint.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\obstack.cpp">
+					RelativePath="..\..\ode\src\collision_transform.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\ode.cpp">
+					RelativePath="..\..\ode\src\obstack.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\odemath.cpp">
+					RelativePath="..\..\ode\src\collision_util.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\quickstep.cpp">
+					RelativePath="..\..\ode\src\error.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\rotation.cpp">
+					RelativePath="..\..\ode\src\stepfast.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\step.cpp">
+					RelativePath="..\..\ode\src\collision_cylinder_sphere.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\stepfast.cpp">
+					RelativePath="..\..\ode\src\collision_kernel.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\testing.cpp">
+					RelativePath="..\..\ode\src\collision_trimesh_sphere.cpp">
 				</File>
 				<File
-					RelativePath="..\..\ode\src\timer.cpp">
+					RelativePath="..\..\ode\src\collision_cylinder_box.cpp">
 				</File>
-				<File
-					RelativePath="..\..\ode\src\util.cpp">
-				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -368,28 +370,34 @@
 				Name="Ice"
 				Filter="">
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceAABB.h">
+					RelativePath="..\..\OPCODE\Ice\IceMemoryMacros.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceAxes.h">
+					RelativePath="..\..\OPCODE\Ice\IcePairs.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceBoundingSphere.h">
+					RelativePath="..\..\OPCODE\Ice\IceRandom.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceContainer.h">
+					RelativePath="..\..\OPCODE\Ice\IceRevisitedRadix.h">
 				</File>
 				<File
+					RelativePath="..\..\OPCODE\Ice\IcePreprocessor.h">
+				</File>
+				<File
+					RelativePath="..\..\OPCODE\Ice\IcePoint.h">
+				</File>
+				<File
 					RelativePath="..\..\OPCODE\Ice\IceFPU.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceHPoint.h">
+					RelativePath="..\..\OPCODE\Ice\IceTriList.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceIndexedTriangle.h">
+					RelativePath="..\..\OPCODE\Ice\IcePlane.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceLSS.h">
+					RelativePath="..\..\OPCODE\Ice\IceAxes.h">
 				</File>
 				<File
 					RelativePath="..\..\OPCODE\Ice\IceMatrix3x3.h">
@@ -398,264 +406,258 @@
 					RelativePath="..\..\OPCODE\Ice\IceMatrix4x4.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceMemoryMacros.h">
+					RelativePath="..\..\OPCODE\Ice\IceTriangle.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceOBB.h">
+					RelativePath="..\..\OPCODE\Ice\IceBoundingSphere.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IcePairs.h">
+					RelativePath="..\..\OPCODE\Ice\IceContainer.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IcePlane.h">
+					RelativePath="..\..\OPCODE\Ice\IceAABB.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IcePoint.h">
+					RelativePath="..\..\OPCODE\Ice\IceRay.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IcePreprocessor.h">
+					RelativePath="..\..\OPCODE\Ice\IceUtils.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceRandom.h">
+					RelativePath="..\..\OPCODE\Ice\IceHPoint.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceRay.h">
+					RelativePath="..\..\OPCODE\Ice\IceLSS.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceRevisitedRadix.h">
+					RelativePath="..\..\OPCODE\Ice\IceOBB.h">
 				</File>
 				<File
 					RelativePath="..\..\OPCODE\Ice\IceSegment.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceTriangle.h">
+					RelativePath="..\..\OPCODE\Ice\IceTypes.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceTriList.h">
+					RelativePath="..\..\OPCODE\Ice\IceIndexedTriangle.h">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceTypes.h">
+					RelativePath="..\..\OPCODE\Ice\IceContainer.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceUtils.h">
+					RelativePath="..\..\OPCODE\Ice\IceAABB.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceAABB.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceRay.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceContainer.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceUtils.cpp">
 				</File>
 				<File
 					RelativePath="..\..\OPCODE\Ice\IceHPoint.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceIndexedTriangle.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceSegment.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceMatrix3x3.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceOBB.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceMatrix4x4.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceIndexedTriangle.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceOBB.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceRandom.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IcePlane.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceRevisitedRadix.cpp">
 				</File>
 				<File
 					RelativePath="..\..\OPCODE\Ice\IcePoint.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceRandom.cpp">
+					RelativePath="..\..\OPCODE\Ice\IcePlane.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceRay.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceMatrix3x3.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceRevisitedRadix.cpp">
+					RelativePath="..\..\OPCODE\Ice\IceMatrix4x4.cpp">
 				</File>
 				<File
-					RelativePath="..\..\OPCODE\Ice\IceSegment.cpp">
-				</File>
-				<File
 					RelativePath="..\..\OPCODE\Ice\IceTriangle.cpp">
 				</File>
-				<File
-					RelativePath="..\..\OPCODE\Ice\IceUtils.cpp">
-				</File>
 			</Filter>
 			<File
-				RelativePath="..\..\OPCODE\Opcode.h">
+				RelativePath="..\..\OPCODE\OPC_PlanesTriOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_AABBCollider.h">
+				RelativePath="..\..\OPCODE\OPC_RayAABBOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_AABBTree.h">
+				RelativePath="..\..\OPCODE\OPC_LSSAABBOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_BaseModel.h">
+				RelativePath="..\..\OPCODE\OPC_PlanesCollider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_BoxBoxOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_Settings.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_BoxPruning.h">
+				RelativePath="..\..\OPCODE\OPC_TriBoxOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Collider.h">
+				RelativePath="..\..\OPCODE\OPC_AABBCollider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Common.h">
+				RelativePath="..\..\OPCODE\OPC_RayTriOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_HybridModel.h">
+				RelativePath="..\..\OPCODE\OPC_LSSTriOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_IceHook.h">
+				RelativePath="..\..\OPCODE\OPC_RayCollider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_LSSAABBOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_TreeCollider.h">
 			</File>
 			<File
 				RelativePath="..\..\OPCODE\OPC_LSSCollider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_LSSTriOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_OBBCollider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_MeshInterface.h">
+				RelativePath="..\..\OPCODE\OPC_PlanesAABBOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Model.h">
+				RelativePath="..\..\OPCODE\OPC_IceHook.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_OBBCollider.h">
+				RelativePath="..\..\OPCODE\OPC_Common.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_OptimizedTree.h">
+				RelativePath="..\..\OPCODE\Stdafx.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Picking.h">
+				RelativePath="..\..\OPCODE\OPC_TreeBuilders.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_PlanesAABBOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_BoxBoxOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_PlanesCollider.h">
+				RelativePath="..\..\OPCODE\OPC_BaseModel.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_PlanesTriOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_BoxPruning.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_RayAABBOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_Collider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_RayCollider.h">
+				RelativePath="..\..\OPCODE\OPC_SphereTriOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_RayTriOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_Model.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Settings.h">
+				RelativePath="..\..\OPCODE\OPC_HybridModel.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_SphereAABBOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_SphereCollider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_SphereCollider.h">
+				RelativePath="..\..\OPCODE\OPC_AABBTree.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_SphereTriOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_TriTriOverlap.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_SweepAndPrune.h">
+				RelativePath="..\..\OPCODE\Opcode.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_TreeBuilders.h">
+				RelativePath="..\..\OPCODE\OPC_MeshInterface.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_TreeCollider.h">
+				RelativePath="..\..\OPCODE\OPC_SweepAndPrune.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_TriBoxOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_Picking.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_TriTriOverlap.h">
+				RelativePath="..\..\OPCODE\OPC_OptimizedTree.h">
 			</File>
 			<File
+				RelativePath="..\..\OPCODE\OPC_SphereAABBOverlap.h">
+			</File>
+			<File
 				RelativePath="..\..\OPCODE\OPC_VolumeCollider.h">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\Stdafx.h">
+				RelativePath="..\..\OPCODE\OPC_Collider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\Opcode.cpp">
+				RelativePath="..\..\OPCODE\OPC_Model.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_AABBCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_HybridModel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_AABBTree.cpp">
+				RelativePath="..\..\OPCODE\OPC_SphereCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_BaseModel.cpp">
+				RelativePath="..\..\OPCODE\OPC_AABBTree.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_BoxPruning.cpp">
+				RelativePath="..\..\OPCODE\Opcode.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Collider.cpp">
+				RelativePath="..\..\OPCODE\OPC_MeshInterface.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Common.cpp">
+				RelativePath="..\..\OPCODE\OPC_SweepAndPrune.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_HybridModel.cpp">
+				RelativePath="..\..\OPCODE\OPC_Picking.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_LSSCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_OptimizedTree.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_MeshInterface.cpp">
+				RelativePath="..\..\OPCODE\OPC_VolumeCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Model.cpp">
+				RelativePath="..\..\OPCODE\StdAfx.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_OBBCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_PlanesCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_OptimizedTree.cpp">
+				RelativePath="..\..\OPCODE\OPC_AABBCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_Picking.cpp">
+				RelativePath="..\..\OPCODE\OPC_RayCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_PlanesCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_TreeCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_RayCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_LSSCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_SphereCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_OBBCollider.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_SweepAndPrune.cpp">
+				RelativePath="..\..\OPCODE\OPC_Common.cpp">
 			</File>
 			<File
 				RelativePath="..\..\OPCODE\OPC_TreeBuilders.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_TreeCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_BaseModel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\OPCODE\OPC_VolumeCollider.cpp">
+				RelativePath="..\..\OPCODE\OPC_BoxPruning.cpp">
 			</File>
-			<File
-				RelativePath="..\..\OPCODE\StdAfx.cpp">
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/new_build/build/vs2002/test_I.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_I.vcproj	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/test_I.vcproj	2006-03-23 00:54:04 UTC (rev 868)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_I"
-	ProjectGUID="{531A7AD1-2589-BE42-96B0-1686543EBC86}"
+	ProjectGUID="{24E3BC87-9E28-EE43-9DFD-E1ECF66F1257}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_I.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../lib/debug"
@@ -82,7 +82,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_I.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../lib/release"

Modified: branches/new_build/build/vs2002/test_boxstack.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_boxstack.vcproj	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/test_boxstack.vcproj	2006-03-23 00:54:04 UTC (rev 868)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_boxstack"
-	ProjectGUID="{CBCCCF87-9F41-494D-800D-0A2563A477AA}"
+	ProjectGUID="{9B2D29E5-BD03-434F-B3AE-6E29E1BF4E2F}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_boxstack.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../lib/debug"
@@ -82,7 +82,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_boxstack.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../lib/release"

Modified: branches/new_build/build/vs2002/test_buggy.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_buggy.vcproj	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/test_buggy.vcproj	2006-03-23 00:54:04 UTC (rev 868)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_buggy"
-	ProjectGUID="{A337A401-E2A4-B340-8D96-0094B8197436}"
+	ProjectGUID="{EB766DA0-5377-D04D-B5A2-98DBDEBB6581}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_buggy.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../lib/debug"
@@ -82,7 +82,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_buggy.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../lib/release"

Modified: branches/new_build/build/vs2002/test_chain1.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_chain1.vcproj	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/test_chain1.vcproj	2006-03-23 00:54:04 UTC (rev 868)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_chain1"
-	ProjectGUID="{6A45A4A7-CE88-C641-B817-F081F91BE1DC}"
+	ProjectGUID="{4880D91D-D1DC-154C-B92C-F4E3034D6AC8}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/debug/ode.lib ../../lib/debug/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_chain1.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../lib/debug"
@@ -82,7 +82,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib gdi32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="../../lib/release/ode.lib ../../lib/release/drawstuff.lib user32.lib gdi32.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/test_chain1.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../lib/release"

Modified: branches/new_build/build/vs2002/test_chain2.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_chain2.vcproj	2006-03-20 21:04:36 UTC (rev 867)
+++ branches/new_build/build/vs2002/test_chain2.vcproj	2006-03-23 00:54:04 UTC (rev 868)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_chain2"
-	ProjectGUID="{1C8279B9-F67C-B945...
 
[truncated message content]

[Opende-svn] SF.net SVN: opende: [867] branches/new_build/build/vs2005

[<jas...@us...>]

Revision: 867
Author:   jason379
Date:     2006-03-20 13:04:36 -0800 (Mon, 20 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=867&view=rev

Log Message:
-----------
Removed precompiled header flag from VS2005 fields, doesn't work the same as other VS2002-2003

Modified Paths:
--------------
    branches/new_build/build/vs2005/drawstuff.vcproj
    branches/new_build/build/vs2005/ode.sln
    branches/new_build/build/vs2005/ode.vcproj
    branches/new_build/build/vs2005/test_I.vcproj
    branches/new_build/build/vs2005/test_boxstack.vcproj
    branches/new_build/build/vs2005/test_buggy.vcproj
    branches/new_build/build/vs2005/test_chain1.vcproj
    branches/new_build/build/vs2005/test_chain2.vcproj
    branches/new_build/build/vs2005/test_collision.vcproj
    branches/new_build/build/vs2005/test_crash.vcproj
    branches/new_build/build/vs2005/test_cyl.vcproj
    branches/new_build/build/vs2005/test_friction.vcproj
    branches/new_build/build/vs2005/test_hinge.vcproj
    branches/new_build/build/vs2005/test_joints.vcproj
    branches/new_build/build/vs2005/test_moving_trimesh.vcproj
    branches/new_build/build/vs2005/test_ode.vcproj
    branches/new_build/build/vs2005/test_slider.vcproj
    branches/new_build/build/vs2005/test_space.vcproj
    branches/new_build/build/vs2005/test_space_stress.vcproj
    branches/new_build/build/vs2005/test_step.vcproj
    branches/new_build/build/vs2005/test_trimesh.vcproj
    branches/new_build/build/vs2005/tests.vcproj
Modified: branches/new_build/build/vs2005/drawstuff.vcproj
===================================================================
--- branches/new_build/build/vs2005/drawstuff.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/drawstuff.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="drawstuff"
-	ProjectGUID="{5920F646-CAB8-E047-8404-673B98A523BD}"
+	ProjectGUID="{8951F7D0-798B-5041-8E41-7090C33A0B30}"
 	RootNamespace="drawstuff"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -120,7 +120,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/ode.sln
===================================================================
--- branches/new_build/build/vs2005/ode.sln	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/ode.sln	2006-03-20 21:04:36 UTC (rev 867)
@@ -1,124 +1,124 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{B9EB3C29-2F8E-AD4C-9611-20BC28043608}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{5920F646-CAB8-E047-8404-673B98A523BD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{8951F7D0-798B-5041-8E41-7090C33A0B30}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{6DEAFB4D-A015-5144-8094-1628A9C56627}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{045413DA-3FF3-904C-8BF8-7B73F7F2F9E5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{6D09A275-C98F-B74B-9CED-88A70B54CA1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{3F332C1A-9AFA-AB48-8292-7510A5137045}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{0699033C-5E38-D646-9833-757A92831089}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{44F57E4A-5D18-7E4C-B66D-450019FE0559}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{8D028A1A-0B3A-DD42-8BAD-D7792D122A61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{B30F0226-32D6-D74D-A069-5608F57160E2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{D8CD2A7A-42CC-2D4A-BB4E-83FB732E8599}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{3DBF8E26-3550-1244-AA8B-20998478D251}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{CA88572B-1A98-8842-B5F5-CDC9E6A7BBEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{EE592B5C-4725-8D44-85A9-E68DA60CD19B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{7A4DFB1E-EBCB-D74E-A6FC-7407180C48B6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{F0C47DB6-7899-AF4E-ABB4-BC28A35DD620}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{2B64CA69-ECC8-6E4A-916C-1809CD8459E1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{7F352FEA-453C-9743-BB93-B291B43C527B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_I", "./test_I.vcproj", "{E7484EAB-812D-3E4D-BA1F-2BF3BE49FFBB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_I", "./test_I.vcproj", "{52B2352D-04C5-764E-817C-1F08B247183E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_joints", "./test_joints.vcproj", "{F21E0FCF-80D1-624D-89FD-FE85C926DC05}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_joints", "./test_joints.vcproj", "{FD780690-4F49-5A4E-88AF-ACE670A53044}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ode", "./test_ode.vcproj", "{1A9382F4-6918-B84C-9EAA-C395292DC071}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ode", "./test_ode.vcproj", "{813E65E0-2E2C-FD49-AE18-21EE6954D172}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_slider", "./test_slider.vcproj", "{D1BCA620-11D0-094E-9D41-0D086BB3DBEB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_slider", "./test_slider.vcproj", "{7C1D8D31-1FB4-CE4E-A92F-1B12BDD33D64}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space", "./test_space.vcproj", "{C7C16F86-8E2B-414A-8507-2E6BD7953FBC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space", "./test_space.vcproj", "{5EBD3120-3BE5-DC4C-9733-1951265BE2A7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space_stress", "./test_space_stress.vcproj", "{D0C1FACC-A35E-DA4A-8076-D5A60A66A287}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space_stress", "./test_space_stress.vcproj", "{EF4DA970-57FA-314C-97C9-1B1D7CB220A4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_step", "./test_step.vcproj", "{D0329AB8-DE0E-B447-A9C0-A407D33810D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_step", "./test_step.vcproj", "{871A49DC-D619-F749-A97B-A0DB7B38E5CF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyl", "./test_cyl.vcproj", "{CF37A00A-5DD1-D34A-AB2C-798B08904DBC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyl", "./test_cyl.vcproj", "{8376751D-EE4F-DC4E-9942-85C0A16039CE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_moving_trimesh", "./test_moving_trimesh.vcproj", "{A9C3C251-1456-1848-A9CC-54CD766DBDA1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_moving_trimesh", "./test_moving_trimesh.vcproj", "{CC14F77B-ED33-E04D-950F-F4E910FBDFE7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_trimesh", "./test_trimesh.vcproj", "{1095F9B7-C733-D449-9DFB-FE5F9502A6E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_trimesh", "./test_trimesh.vcproj", "{76B3F7A1-F98C-5048-9A26-5118F947E2C4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
-		{5920F646-CAB8-E047-8404-673B98A523BD} = {5920F646-CAB8-E047-8404-673B98A523BD}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
+		{8951F7D0-798B-5041-8E41-7090C33A0B30} = {8951F7D0-798B-5041-8E41-7090C33A0B30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "./tests.vcproj", "{54660F56-41CD-4147-B783-95F8611EE4DD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "./tests.vcproj", "{3A95AEE7-915B-6A41-BCE3-58BA5B479C0E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D} = {5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608} = {B9EB3C29-2F8E-AD4C-9611-20BC28043608}
 	EndProjectSection
 EndProject
 Global
@@ -127,90 +127,90 @@
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}.Debug|Win32.Build.0 = Debug|Win32
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}.Release|Win32.ActiveCfg = Release|Win32
-		{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}.Release|Win32.Build.0 = Release|Win32
-		{5920F646-CAB8-E047-8404-673B98A523BD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5920F646-CAB8-E047-8404-673B98A523BD}.Debug|Win32.Build.0 = Debug|Win32
-		{5920F646-CAB8-E047-8404-673B98A523BD}.Release|Win32.ActiveCfg = Release|Win32
-		{5920F646-CAB8-E047-8404-673B98A523BD}.Release|Win32.Build.0 = Release|Win32
-		{6DEAFB4D-A015-5144-8094-1628A9C56627}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6DEAFB4D-A015-5144-8094-1628A9C56627}.Debug|Win32.Build.0 = Debug|Win32
-		{6DEAFB4D-A015-5144-8094-1628A9C56627}.Release|Win32.ActiveCfg = Release|Win32
-		{6DEAFB4D-A015-5144-8094-1628A9C56627}.Release|Win32.Build.0 = Release|Win32
-		{6D09A275-C98F-B74B-9CED-88A70B54CA1B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6D09A275-C98F-B74B-9CED-88A70B54CA1B}.Debug|Win32.Build.0 = Debug|Win32
-		{6D09A275-C98F-B74B-9CED-88A70B54CA1B}.Release|Win32.ActiveCfg = Release|Win32
-		{6D09A275-C98F-B74B-9CED-88A70B54CA1B}.Release|Win32.Build.0 = Release|Win32
-		{0699033C-5E38-D646-9833-757A92831089}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0699033C-5E38-D646-9833-757A92831089}.Debug|Win32.Build.0 = Debug|Win32
-		{0699033C-5E38-D646-9833-757A92831089}.Release|Win32.ActiveCfg = Release|Win32
-		{0699033C-5E38-D646-9833-757A92831089}.Release|Win32.Build.0 = Release|Win32
-		{8D028A1A-0B3A-DD42-8BAD-D7792D122A61}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D028A1A-0B3A-DD42-8BAD-D7792D122A61}.Debug|Win32.Build.0 = Debug|Win32
-		{8D028A1A-0B3A-DD42-8BAD-D7792D122A61}.Release|Win32.ActiveCfg = Release|Win32
-		{8D028A1A-0B3A-DD42-8BAD-D7792D122A61}.Release|Win32.Build.0 = Release|Win32
-		{D8CD2A7A-42CC-2D4A-BB4E-83FB732E8599}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D8CD2A7A-42CC-2D4A-BB4E-83FB732E8599}.Debug|Win32.Build.0 = Debug|Win32
-		{D8CD2A7A-42CC-2D4A-BB4E-83FB732E8599}.Release|Win32.ActiveCfg = Release|Win32
-		{D8CD2A7A-42CC-2D4A-BB4E-83FB732E8599}.Release|Win32.Build.0 = Release|Win32
-		{CA88572B-1A98-8842-B5F5-CDC9E6A7BBEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CA88572B-1A98-8842-B5F5-CDC9E6A7BBEC}.Debug|Win32.Build.0 = Debug|Win32
-		{CA88572B-1A98-8842-B5F5-CDC9E6A7BBEC}.Release|Win32.ActiveCfg = Release|Win32
-		{CA88572B-1A98-8842-B5F5-CDC9E6A7BBEC}.Release|Win32.Build.0 = Release|Win32
-		{7A4DFB1E-EBCB-D74E-A6FC-7407180C48B6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A4DFB1E-EBCB-D74E-A6FC-7407180C48B6}.Debug|Win32.Build.0 = Debug|Win32
-		{7A4DFB1E-EBCB-D74E-A6FC-7407180C48B6}.Release|Win32.ActiveCfg = Release|Win32
-		{7A4DFB1E-EBCB-D74E-A6FC-7407180C48B6}.Release|Win32.Build.0 = Release|Win32
-		{2B64CA69-ECC8-6E4A-916C-1809CD8459E1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B64CA69-ECC8-6E4A-916C-1809CD8459E1}.Debug|Win32.Build.0 = Debug|Win32
-		{2B64CA69-ECC8-6E4A-916C-1809CD8459E1}.Release|Win32.ActiveCfg = Release|Win32
-		{2B64CA69-ECC8-6E4A-916C-1809CD8459E1}.Release|Win32.Build.0 = Release|Win32
-		{E7484EAB-812D-3E4D-BA1F-2BF3BE49FFBB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7484EAB-812D-3E4D-BA1F-2BF3BE49FFBB}.Debug|Win32.Build.0 = Debug|Win32
-		{E7484EAB-812D-3E4D-BA1F-2BF3BE49FFBB}.Release|Win32.ActiveCfg = Release|Win32
-		{E7484EAB-812D-3E4D-BA1F-2BF3BE49FFBB}.Release|Win32.Build.0 = Release|Win32
-		{F21E0FCF-80D1-624D-89FD-FE85C926DC05}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F21E0FCF-80D1-624D-89FD-FE85C926DC05}.Debug|Win32.Build.0 = Debug|Win32
-		{F21E0FCF-80D1-624D-89FD-FE85C926DC05}.Release|Win32.ActiveCfg = Release|Win32
-		{F21E0FCF-80D1-624D-89FD-FE85C926DC05}.Release|Win32.Build.0 = Release|Win32
-		{1A9382F4-6918-B84C-9EAA-C395292DC071}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A9382F4-6918-B84C-9EAA-C395292DC071}.Debug|Win32.Build.0 = Debug|Win32
-		{1A9382F4-6918-B84C-9EAA-C395292DC071}.Release|Win32.ActiveCfg = Release|Win32
-		{1A9382F4-6918-B84C-9EAA-C395292DC071}.Release|Win32.Build.0 = Release|Win32
-		{D1BCA620-11D0-094E-9D41-0D086BB3DBEB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D1BCA620-11D0-094E-9D41-0D086BB3DBEB}.Debug|Win32.Build.0 = Debug|Win32
-		{D1BCA620-11D0-094E-9D41-0D086BB3DBEB}.Release|Win32.ActiveCfg = Release|Win32
-		{D1BCA620-11D0-094E-9D41-0D086BB3DBEB}.Release|Win32.Build.0 = Release|Win32
-		{C7C16F86-8E2B-414A-8507-2E6BD7953FBC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C7C16F86-8E2B-414A-8507-2E6BD7953FBC}.Debug|Win32.Build.0 = Debug|Win32
-		{C7C16F86-8E2B-414A-8507-2E6BD7953FBC}.Release|Win32.ActiveCfg = Release|Win32
-		{C7C16F86-8E2B-414A-8507-2E6BD7953FBC}.Release|Win32.Build.0 = Release|Win32
-		{D0C1FACC-A35E-DA4A-8076-D5A60A66A287}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0C1FACC-A35E-DA4A-8076-D5A60A66A287}.Debug|Win32.Build.0 = Debug|Win32
-		{D0C1FACC-A35E-DA4A-8076-D5A60A66A287}.Release|Win32.ActiveCfg = Release|Win32
-		{D0C1FACC-A35E-DA4A-8076-D5A60A66A287}.Release|Win32.Build.0 = Release|Win32
-		{D0329AB8-DE0E-B447-A9C0-A407D33810D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0329AB8-DE0E-B447-A9C0-A407D33810D4}.Debug|Win32.Build.0 = Debug|Win32
-		{D0329AB8-DE0E-B447-A9C0-A407D33810D4}.Release|Win32.ActiveCfg = Release|Win32
-		{D0329AB8-DE0E-B447-A9C0-A407D33810D4}.Release|Win32.Build.0 = Release|Win32
-		{CF37A00A-5DD1-D34A-AB2C-798B08904DBC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CF37A00A-5DD1-D34A-AB2C-798B08904DBC}.Debug|Win32.Build.0 = Debug|Win32
-		{CF37A00A-5DD1-D34A-AB2C-798B08904DBC}.Release|Win32.ActiveCfg = Release|Win32
-		{CF37A00A-5DD1-D34A-AB2C-798B08904DBC}.Release|Win32.Build.0 = Release|Win32
-		{A9C3C251-1456-1848-A9CC-54CD766DBDA1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A9C3C251-1456-1848-A9CC-54CD766DBDA1}.Debug|Win32.Build.0 = Debug|Win32
-		{A9C3C251-1456-1848-A9CC-54CD766DBDA1}.Release|Win32.ActiveCfg = Release|Win32
-		{A9C3C251-1456-1848-A9CC-54CD766DBDA1}.Release|Win32.Build.0 = Release|Win32
-		{1095F9B7-C733-D449-9DFB-FE5F9502A6E4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1095F9B7-C733-D449-9DFB-FE5F9502A6E4}.Debug|Win32.Build.0 = Debug|Win32
-		{1095F9B7-C733-D449-9DFB-FE5F9502A6E4}.Release|Win32.ActiveCfg = Release|Win32
-		{1095F9B7-C733-D449-9DFB-FE5F9502A6E4}.Release|Win32.Build.0 = Release|Win32
-		{54660F56-41CD-4147-B783-95F8611EE4DD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{54660F56-41CD-4147-B783-95F8611EE4DD}.Debug|Win32.Build.0 = Debug|Win32
-		{54660F56-41CD-4147-B783-95F8611EE4DD}.Release|Win32.ActiveCfg = Release|Win32
-		{54660F56-41CD-4147-B783-95F8611EE4DD}.Release|Win32.Build.0 = Release|Win32
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608}.Debug|Win32.Build.0 = Debug|Win32
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608}.Release|Win32.ActiveCfg = Release|Win32
+		{B9EB3C29-2F8E-AD4C-9611-20BC28043608}.Release|Win32.Build.0 = Release|Win32
+		{8951F7D0-798B-5041-8E41-7090C33A0B30}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8951F7D0-798B-5041-8E41-7090C33A0B30}.Debug|Win32.Build.0 = Debug|Win32
+		{8951F7D0-798B-5041-8E41-7090C33A0B30}.Release|Win32.ActiveCfg = Release|Win32
+		{8951F7D0-798B-5041-8E41-7090C33A0B30}.Release|Win32.Build.0 = Release|Win32
+		{045413DA-3FF3-904C-8BF8-7B73F7F2F9E5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{045413DA-3FF3-904C-8BF8-7B73F7F2F9E5}.Debug|Win32.Build.0 = Debug|Win32
+		{045413DA-3FF3-904C-8BF8-7B73F7F2F9E5}.Release|Win32.ActiveCfg = Release|Win32
+		{045413DA-3FF3-904C-8BF8-7B73F7F2F9E5}.Release|Win32.Build.0 = Release|Win32
+		{3F332C1A-9AFA-AB48-8292-7510A5137045}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3F332C1A-9AFA-AB48-8292-7510A5137045}.Debug|Win32.Build.0 = Debug|Win32
+		{3F332C1A-9AFA-AB48-8292-7510A5137045}.Release|Win32.ActiveCfg = Release|Win32
+		{3F332C1A-9AFA-AB48-8292-7510A5137045}.Release|Win32.Build.0 = Release|Win32
+		{44F57E4A-5D18-7E4C-B66D-450019FE0559}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44F57E4A-5D18-7E4C-B66D-450019FE0559}.Debug|Win32.Build.0 = Debug|Win32
+		{44F57E4A-5D18-7E4C-B66D-450019FE0559}.Release|Win32.ActiveCfg = Release|Win32
+		{44F57E4A-5D18-7E4C-B66D-450019FE0559}.Release|Win32.Build.0 = Release|Win32
+		{B30F0226-32D6-D74D-A069-5608F57160E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B30F0226-32D6-D74D-A069-5608F57160E2}.Debug|Win32.Build.0 = Debug|Win32
+		{B30F0226-32D6-D74D-A069-5608F57160E2}.Release|Win32.ActiveCfg = Release|Win32
+		{B30F0226-32D6-D74D-A069-5608F57160E2}.Release|Win32.Build.0 = Release|Win32
+		{3DBF8E26-3550-1244-AA8B-20998478D251}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3DBF8E26-3550-1244-AA8B-20998478D251}.Debug|Win32.Build.0 = Debug|Win32
+		{3DBF8E26-3550-1244-AA8B-20998478D251}.Release|Win32.ActiveCfg = Release|Win32
+		{3DBF8E26-3550-1244-AA8B-20998478D251}.Release|Win32.Build.0 = Release|Win32
+		{EE592B5C-4725-8D44-85A9-E68DA60CD19B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE592B5C-4725-8D44-85A9-E68DA60CD19B}.Debug|Win32.Build.0 = Debug|Win32
+		{EE592B5C-4725-8D44-85A9-E68DA60CD19B}.Release|Win32.ActiveCfg = Release|Win32
+		{EE592B5C-4725-8D44-85A9-E68DA60CD19B}.Release|Win32.Build.0 = Release|Win32
+		{F0C47DB6-7899-AF4E-ABB4-BC28A35DD620}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F0C47DB6-7899-AF4E-ABB4-BC28A35DD620}.Debug|Win32.Build.0 = Debug|Win32
+		{F0C47DB6-7899-AF4E-ABB4-BC28A35DD620}.Release|Win32.ActiveCfg = Release|Win32
+		{F0C47DB6-7899-AF4E-ABB4-BC28A35DD620}.Release|Win32.Build.0 = Release|Win32
+		{7F352FEA-453C-9743-BB93-B291B43C527B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7F352FEA-453C-9743-BB93-B291B43C527B}.Debug|Win32.Build.0 = Debug|Win32
+		{7F352FEA-453C-9743-BB93-B291B43C527B}.Release|Win32.ActiveCfg = Release|Win32
+		{7F352FEA-453C-9743-BB93-B291B43C527B}.Release|Win32.Build.0 = Release|Win32
+		{52B2352D-04C5-764E-817C-1F08B247183E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{52B2352D-04C5-764E-817C-1F08B247183E}.Debug|Win32.Build.0 = Debug|Win32
+		{52B2352D-04C5-764E-817C-1F08B247183E}.Release|Win32.ActiveCfg = Release|Win32
+		{52B2352D-04C5-764E-817C-1F08B247183E}.Release|Win32.Build.0 = Release|Win32
+		{FD780690-4F49-5A4E-88AF-ACE670A53044}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FD780690-4F49-5A4E-88AF-ACE670A53044}.Debug|Win32.Build.0 = Debug|Win32
+		{FD780690-4F49-5A4E-88AF-ACE670A53044}.Release|Win32.ActiveCfg = Release|Win32
+		{FD780690-4F49-5A4E-88AF-ACE670A53044}.Release|Win32.Build.0 = Release|Win32
+		{813E65E0-2E2C-FD49-AE18-21EE6954D172}.Debug|Win32.ActiveCfg = Debug|Win32
+		{813E65E0-2E2C-FD49-AE18-21EE6954D172}.Debug|Win32.Build.0 = Debug|Win32
+		{813E65E0-2E2C-FD49-AE18-21EE6954D172}.Release|Win32.ActiveCfg = Release|Win32
+		{813E65E0-2E2C-FD49-AE18-21EE6954D172}.Release|Win32.Build.0 = Release|Win32
+		{7C1D8D31-1FB4-CE4E-A92F-1B12BDD33D64}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7C1D8D31-1FB4-CE4E-A92F-1B12BDD33D64}.Debug|Win32.Build.0 = Debug|Win32
+		{7C1D8D31-1FB4-CE4E-A92F-1B12BDD33D64}.Release|Win32.ActiveCfg = Release|Win32
+		{7C1D8D31-1FB4-CE4E-A92F-1B12BDD33D64}.Release|Win32.Build.0 = Release|Win32
+		{5EBD3120-3BE5-DC4C-9733-1951265BE2A7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5EBD3120-3BE5-DC4C-9733-1951265BE2A7}.Debug|Win32.Build.0 = Debug|Win32
+		{5EBD3120-3BE5-DC4C-9733-1951265BE2A7}.Release|Win32.ActiveCfg = Release|Win32
+		{5EBD3120-3BE5-DC4C-9733-1951265BE2A7}.Release|Win32.Build.0 = Release|Win32
+		{EF4DA970-57FA-314C-97C9-1B1D7CB220A4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EF4DA970-57FA-314C-97C9-1B1D7CB220A4}.Debug|Win32.Build.0 = Debug|Win32
+		{EF4DA970-57FA-314C-97C9-1B1D7CB220A4}.Release|Win32.ActiveCfg = Release|Win32
+		{EF4DA970-57FA-314C-97C9-1B1D7CB220A4}.Release|Win32.Build.0 = Release|Win32
+		{871A49DC-D619-F749-A97B-A0DB7B38E5CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{871A49DC-D619-F749-A97B-A0DB7B38E5CF}.Debug|Win32.Build.0 = Debug|Win32
+		{871A49DC-D619-F749-A97B-A0DB7B38E5CF}.Release|Win32.ActiveCfg = Release|Win32
+		{871A49DC-D619-F749-A97B-A0DB7B38E5CF}.Release|Win32.Build.0 = Release|Win32
+		{8376751D-EE4F-DC4E-9942-85C0A16039CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8376751D-EE4F-DC4E-9942-85C0A16039CE}.Debug|Win32.Build.0 = Debug|Win32
+		{8376751D-EE4F-DC4E-9942-85C0A16039CE}.Release|Win32.ActiveCfg = Release|Win32
+		{8376751D-EE4F-DC4E-9942-85C0A16039CE}.Release|Win32.Build.0 = Release|Win32
+		{CC14F77B-ED33-E04D-950F-F4E910FBDFE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CC14F77B-ED33-E04D-950F-F4E910FBDFE7}.Debug|Win32.Build.0 = Debug|Win32
+		{CC14F77B-ED33-E04D-950F-F4E910FBDFE7}.Release|Win32.ActiveCfg = Release|Win32
+		{CC14F77B-ED33-E04D-950F-F4E910FBDFE7}.Release|Win32.Build.0 = Release|Win32
+		{76B3F7A1-F98C-5048-9A26-5118F947E2C4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{76B3F7A1-F98C-5048-9A26-5118F947E2C4}.Debug|Win32.Build.0 = Debug|Win32
+		{76B3F7A1-F98C-5048-9A26-5118F947E2C4}.Release|Win32.ActiveCfg = Release|Win32
+		{76B3F7A1-F98C-5048-9A26-5118F947E2C4}.Release|Win32.Build.0 = Release|Win32
+		{3A95AEE7-915B-6A41-BCE3-58BA5B479C0E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A95AEE7-915B-6A41-BCE3-58BA5B479C0E}.Debug|Win32.Build.0 = Debug|Win32
+		{3A95AEE7-915B-6A41-BCE3-58BA5B479C0E}.Release|Win32.ActiveCfg = Release|Win32
+		{3A95AEE7-915B-6A41-BCE3-58BA5B479C0E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/new_build/build/vs2005/ode.vcproj
===================================================================
--- branches/new_build/build/vs2005/ode.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/ode.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="ode"
-	ProjectGUID="{5E5A0A22-3F64-964B-A3A3-FD9C62AE750D}"
+	ProjectGUID="{B9EB3C29-2F8E-AD4C-9611-20BC28043608}"
 	RootNamespace="ode"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -127,7 +127,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_I.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_I.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_I.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_I"
-	ProjectGUID="{E7484EAB-812D-3E4D-BA1F-2BF3BE49FFBB}"
+	ProjectGUID="{52B2352D-04C5-764E-817C-1F08B247183E}"
 	RootNamespace="test_I"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_boxstack.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_boxstack.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_boxstack.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_boxstack"
-	ProjectGUID="{6DEAFB4D-A015-5144-8094-1628A9C56627}"
+	ProjectGUID="{045413DA-3FF3-904C-8BF8-7B73F7F2F9E5}"
 	RootNamespace="test_boxstack"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_buggy.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_buggy.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_buggy.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_buggy"
-	ProjectGUID="{6D09A275-C98F-B74B-9CED-88A70B54CA1B}"
+	ProjectGUID="{3F332C1A-9AFA-AB48-8292-7510A5137045}"
 	RootNamespace="test_buggy"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_chain1.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_chain1.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_chain1.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_chain1"
-	ProjectGUID="{0699033C-5E38-D646-9833-757A92831089}"
+	ProjectGUID="{44F57E4A-5D18-7E4C-B66D-450019FE0559}"
 	RootNamespace="test_chain1"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_chain2.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_chain2.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_chain2.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_chain2"
-	ProjectGUID="{8D028A1A-0B3A-DD42-8BAD-D7792D122A61}"
+	ProjectGUID="{B30F0226-32D6-D74D-A069-5608F57160E2}"
 	RootNamespace="test_chain2"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_collision.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_collision.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_collision.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_collision"
-	ProjectGUID="{D8CD2A7A-42CC-2D4A-BB4E-83FB732E8599}"
+	ProjectGUID="{3DBF8E26-3550-1244-AA8B-20998478D251}"
 	RootNamespace="test_collision"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_crash.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_crash.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_crash.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_crash"
-	ProjectGUID="{CA88572B-1A98-8842-B5F5-CDC9E6A7BBEC}"
+	ProjectGUID="{EE592B5C-4725-8D44-85A9-E68DA60CD19B}"
 	RootNamespace="test_crash"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_cyl.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_cyl.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_cyl.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_cyl"
-	ProjectGUID="{CF37A00A-5DD1-D34A-AB2C-798B08904DBC}"
+	ProjectGUID="{8376751D-EE4F-DC4E-9942-85C0A16039CE}"
 	RootNamespace="test_cyl"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_friction.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_friction.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_friction.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_friction"
-	ProjectGUID="{7A4DFB1E-EBCB-D74E-A6FC-7407180C48B6}"
+	ProjectGUID="{F0C47DB6-7899-AF4E-ABB4-BC28A35DD620}"
 	RootNamespace="test_friction"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_hinge.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_hinge.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_hinge.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_hinge"
-	ProjectGUID="{2B64CA69-ECC8-6E4A-916C-1809CD8459E1}"
+	ProjectGUID="{7F352FEA-453C-9743-BB93-B291B43C527B}"
 	RootNamespace="test_hinge"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_joints.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_joints.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_joints.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_joints"
-	ProjectGUID="{F21E0FCF-80D1-624D-89FD-FE85C926DC05}"
+	ProjectGUID="{FD780690-4F49-5A4E-88AF-ACE670A53044}"
 	RootNamespace="test_joints"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_moving_trimesh.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_moving_trimesh.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_moving_trimesh.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_moving_trimesh"
-	ProjectGUID="{A9C3C251-1456-1848-A9CC-54CD766DBDA1}"
+	ProjectGUID="{CC14F77B-ED33-E04D-950F-F4E910FBDFE7}"
 	RootNamespace="test_moving_trimesh"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_ode.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_ode.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_ode.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_ode"
-	ProjectGUID="{1A9382F4-6918-B84C-9EAA-C395292DC071}"
+	ProjectGUID="{813E65E0-2E2C-FD49-AE18-21EE6954D172}"
 	RootNamespace="test_ode"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_slider.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_slider.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_slider.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_slider"
-	ProjectGUID="{D1BCA620-11D0-094E-9D41-0D086BB3DBEB}"
+	ProjectGUID="{7C1D8D31-1FB4-CE4E-A92F-1B12BDD33D64}"
 	RootNamespace="test_slider"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_space.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_space.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_space.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_space"
-	ProjectGUID="{C7C16F86-8E2B-414A-8507-2E6BD7953FBC}"
+	ProjectGUID="{5EBD3120-3BE5-DC4C-9733-1951265BE2A7}"
 	RootNamespace="test_space"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_space_stress.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_space_stress.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_space_stress.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_space_stress"
-	ProjectGUID="{D0C1FACC-A35E-DA4A-8076-D5A60A66A287}"
+	ProjectGUID="{EF4DA970-57FA-314C-97C9-1B1D7CB220A4}"
 	RootNamespace="test_space_stress"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_step.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_step.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_step.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_step"
-	ProjectGUID="{D0329AB8-DE0E-B447-A9C0-A407D33810D4}"
+	ProjectGUID="{871A49DC-D619-F749-A97B-A0DB7B38E5CF}"
 	RootNamespace="test_step"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/test_trimesh.vcproj
===================================================================
--- branches/new_build/build/vs2005/test_trimesh.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/test_trimesh.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_trimesh"
-	ProjectGUID="{1095F9B7-C733-D449-9DFB-FE5F9502A6E4}"
+	ProjectGUID="{76B3F7A1-F98C-5048-9A26-5118F947E2C4}"
 	RootNamespace="test_trimesh"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"

Modified: branches/new_build/build/vs2005/tests.vcproj
===================================================================
--- branches/new_build/build/vs2005/tests.vcproj	2006-03-20 19:07:44 UTC (rev 866)
+++ branches/new_build/build/vs2005/tests.vcproj	2006-03-20 21:04:36 UTC (rev 867)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="tests"
-	ProjectGUID="{54660F56-41CD-4147-B783-95F8611EE4DD}"
+	ProjectGUID="{3A95AEE7-915B-6A41-BCE3-58BA5B479C0E}"
 	RootNamespace="tests"
 	Keyword="Win32Proj"
 	>
@@ -46,7 +46,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -128,7 +128,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [866] branches/new_build/build

[<jas...@us...>]

Revision: 866
Author:   jason379
Date:     2006-03-20 11:07:44 -0800 (Mon, 20 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=866&view=rev

Log Message:
-----------
VS projects will now use precompiled headers.

Modified Paths:
--------------
    branches/new_build/build/premake.lua
    branches/new_build/build/vs2002/drawstuff.vcproj
    branches/new_build/build/vs2002/ode.sln
    branches/new_build/build/vs2002/ode.vcproj
    branches/new_build/build/vs2002/test_I.vcproj
    branches/new_build/build/vs2002/test_boxstack.vcproj
    branches/new_build/build/vs2002/test_buggy.vcproj
    branches/new_build/build/vs2002/test_chain1.vcproj
    branches/new_build/build/vs2002/test_chain2.vcproj
    branches/new_build/build/vs2002/test_collision.vcproj
    branches/new_build/build/vs2002/test_crash.vcproj
    branches/new_build/build/vs2002/test_cyl.vcproj
    branches/new_build/build/vs2002/test_friction.vcproj
    branches/new_build/build/vs2002/test_hinge.vcproj
    branches/new_build/build/vs2002/test_joints.vcproj
    branches/new_build/build/vs2002/test_moving_trimesh.vcproj
    branches/new_build/build/vs2002/test_ode.vcproj
    branches/new_build/build/vs2002/test_slider.vcproj
    branches/new_build/build/vs2002/test_space.vcproj
    branches/new_build/build/vs2002/test_space_stress.vcproj
    branches/new_build/build/vs2002/test_step.vcproj
    branches/new_build/build/vs2002/test_trimesh.vcproj
    branches/new_build/build/vs2002/tests.vcproj
    branches/new_build/build/vs2003/drawstuff.vcproj
    branches/new_build/build/vs2003/ode.sln
    branches/new_build/build/vs2003/ode.vcproj
    branches/new_build/build/vs2003/test_I.vcproj
    branches/new_build/build/vs2003/test_boxstack.vcproj
    branches/new_build/build/vs2003/test_buggy.vcproj
    branches/new_build/build/vs2003/test_chain1.vcproj
    branches/new_build/build/vs2003/test_chain2.vcproj
    branches/new_build/build/vs2003/test_collision.vcproj
    branches/new_build/build/vs2003/test_crash.vcproj
    branches/new_build/build/vs2003/test_cyl.vcproj
    branches/new_build/build/vs2003/test_friction.vcproj
    branches/new_build/build/vs2003/test_hinge.vcproj
    branches/new_build/build/vs2003/test_joints.vcproj
    branches/new_build/build/vs2003/test_moving_trimesh.vcproj
    branches/new_build/build/vs2003/test_ode.vcproj
    branches/new_build/build/vs2003/test_slider.vcproj
    branches/new_build/build/vs2003/test_space.vcproj
    branches/new_build/build/vs2003/test_space_stress.vcproj
    branches/new_build/build/vs2003/test_step.vcproj
    branches/new_build/build/vs2003/test_trimesh.vcproj
    branches/new_build/build/vs2003/tests.vcproj
    branches/new_build/build/vs2005/drawstuff.vcproj
    branches/new_build/build/vs2005/ode.sln
    branches/new_build/build/vs2005/ode.vcproj
    branches/new_build/build/vs2005/test_I.vcproj
    branches/new_build/build/vs2005/test_boxstack.vcproj
    branches/new_build/build/vs2005/test_buggy.vcproj
    branches/new_build/build/vs2005/test_chain1.vcproj
    branches/new_build/build/vs2005/test_chain2.vcproj
    branches/new_build/build/vs2005/test_collision.vcproj
    branches/new_build/build/vs2005/test_crash.vcproj
    branches/new_build/build/vs2005/test_cyl.vcproj
    branches/new_build/build/vs2005/test_friction.vcproj
    branches/new_build/build/vs2005/test_hinge.vcproj
    branches/new_build/build/vs2005/test_joints.vcproj
    branches/new_build/build/vs2005/test_moving_trimesh.vcproj
    branches/new_build/build/vs2005/test_ode.vcproj
    branches/new_build/build/vs2005/test_slider.vcproj
    branches/new_build/build/vs2005/test_space.vcproj
    branches/new_build/build/vs2005/test_space_stress.vcproj
    branches/new_build/build/vs2005/test_step.vcproj
    branches/new_build/build/vs2005/test_trimesh.vcproj
    branches/new_build/build/vs2005/tests.vcproj
Modified: branches/new_build/build/premake.lua
===================================================================
--- branches/new_build/build/premake.lua	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/premake.lua	2006-03-20 19:07:44 UTC (rev 866)
@@ -40,18 +40,14 @@
   end
     
 	
--- Remove toolset directories and generated config.h on clean
+-- Since package.path is set to target, --clean doesn't work as
+-- expected. Remove what I can from here.
 
   function doclean(cmd, arg)
     docommand(cmd, arg)
     if (options["target"] == "") then
       os.remove("../include/ode/config.h")
     end
-    os.rmdir("vs6")
-    os.rmdir("vs2002")
-    os.rmdir("vs2003")
-    os.rmdir("vs2005")
-    os.rmdir("gnu")
     os.rmdir("../lib/debug")
     os.rmdir("../lib/release")
   end
@@ -60,11 +56,10 @@
 -- Generate all toolsets in one go
 
   function domakeall(cmd, arg)
-    os.execute("premake --with-tests --clean")
-    os.execute("premake --with-tests --target vs6")
-    os.execute("premake --with-tests --target vs2002")
-    os.execute("premake --with-tests --target vs2003")
-    os.execute("premake --with-tests --target vs2005")
-    -- os.execute("premake --with-tests --target gnu") -- not ready yet
+    os.execute("premake --with-tests --clean --target vs6")
+    os.execute("premake --with-tests --clean --target vs2002")
+    os.execute("premake --with-tests --clean --target vs2003")
+    os.execute("premake --with-tests --clean --target vs2005")
+    -- os.execute("premake --with-tests --clean --target gnu") -- not ready yet
   end
   
\ No newline at end of file

Modified: branches/new_build/build/vs2002/drawstuff.vcproj
===================================================================
--- branches/new_build/build/vs2002/drawstuff.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/drawstuff.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="drawstuff"
-	ProjectGUID="{37DEC458-A6EB-C44C-BA9E-B021E0A286D4}"
+	ProjectGUID="{EB226AE6-4232-8949-94AA-C1F6E1E0322D}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -66,7 +66,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/ode.sln
===================================================================
--- branches/new_build/build/vs2002/ode.sln	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/ode.sln	2006-03-20 19:07:44 UTC (rev 866)
@@ -1,45 +1,45 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{53689F97-7383-CC46-823E-853D0041DB83}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{37DEC458-A6EB-C44C-BA9E-B021E0A286D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{EB226AE6-4232-8949-94AA-C1F6E1E0322D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{CBCCCF87-9F41-494D-800D-0A2563A477AA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{64167A68-4546-D24A-B360-A12584085FF0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{A337A401-E2A4-B340-8D96-0094B8197436}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{75D70CB6-FC76-D64C-8518-F53C2F962B3E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{6A45A4A7-CE88-C641-B817-F081F91BE1DC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{DF8B1279-96C1-B540-89B5-F614542CAB49}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{1C8279B9-F67C-B945-A889-38EC210EDD6A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{E134D1F7-AA4D-864E-99DD-F34547418A48}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{D9B23F76-E5F9-4445-8A0B-40812467ED27}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{091F7848-1A66-544D-BDE9-88E67B8AE6A7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{E658F4EA-7900-8044-8C32-D07DBAD35DB5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_I", "./test_I.vcproj", "{18EC558B-70B1-ED4F-8365-4F6528612BEA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_I", "./test_I.vcproj", "{531A7AD1-2589-BE42-96B0-1686543EBC86}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_joints", "./test_joints.vcproj", "{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_joints", "./test_joints.vcproj", "{DA94F34F-E7CA-484C-8A33-8E00CA237116}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ode", "./test_ode.vcproj", "{06E152F1-9254-5742-824C-7FF4B6B80B77}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ode", "./test_ode.vcproj", "{A9784F09-498F-194E-96DF-47185D05CC0C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_slider", "./test_slider.vcproj", "{DECF0DA6-966D-9247-AEFB-820735C5D33A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_slider", "./test_slider.vcproj", "{15972BB0-7EA1-B24B-975F-5D0AEBD45224}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space", "./test_space.vcproj", "{6E7A09DB-FC84-CF46-A814-F9E6499D547F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space", "./test_space.vcproj", "{0868390D-2298-484F-BE0A-A767FBA35014}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space_stress", "./test_space_stress.vcproj", "{A109A538-6CA8-2D4E-97B7-6F4974B55E64}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_space_stress", "./test_space_stress.vcproj", "{3F177A7C-92B8-BB4E-B414-D892C2B5266B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_step", "./test_step.vcproj", "{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_step", "./test_step.vcproj", "{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyl", "./test_cyl.vcproj", "{D02B65D1-2568-954D-8584-AB351288E3FD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyl", "./test_cyl.vcproj", "{BF5BC703-2F23-EF4A-850D-09BF66542A42}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_moving_trimesh", "./test_moving_trimesh.vcproj", "{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_moving_trimesh", "./test_moving_trimesh.vcproj", "{F54FB367-9897-3941-9787-20134FAF6B1F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_trimesh", "./test_trimesh.vcproj", "{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_trimesh", "./test_trimesh.vcproj", "{DFE3CE67-3550-8F44-996E-B5302D9A14FC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "./tests.vcproj", "{8BC2EFE9-08F8-B545-B361-6FA1814ECFF4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "./tests.vcproj", "{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}"
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
@@ -47,129 +47,129 @@
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{64167A68-4546-D24A-B360-A12584085FF0}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{64167A68-4546-D24A-B360-A12584085FF0}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{75D70CB6-FC76-D64C-8518-F53C2F962B3E}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{75D70CB6-FC76-D64C-8518-F53C2F962B3E}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{DF8B1279-96C1-B540-89B5-F614542CAB49}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{DF8B1279-96C1-B540-89B5-F614542CAB49}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{E134D1F7-AA4D-864E-99DD-F34547418A48}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{E134D1F7-AA4D-864E-99DD-F34547418A48}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{18EC558B-70B1-ED4F-8365-4F6528612BEA}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{18EC558B-70B1-ED4F-8365-4F6528612BEA}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{06E152F1-9254-5742-824C-7FF4B6B80B77}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{06E152F1-9254-5742-824C-7FF4B6B80B77}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{DECF0DA6-966D-9247-AEFB-820735C5D33A}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{DECF0DA6-966D-9247-AEFB-820735C5D33A}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{6E7A09DB-FC84-CF46-A814-F9E6499D547F}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{6E7A09DB-FC84-CF46-A814-F9E6499D547F}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{A109A538-6CA8-2D4E-97B7-6F4974B55E64}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{A109A538-6CA8-2D4E-97B7-6F4974B55E64}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{D02B65D1-2568-954D-8584-AB351288E3FD}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{D02B65D1-2568-954D-8584-AB351288E3FD}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
-		{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}.1 = {37DEC458-A6EB-C44C-BA9E-B021E0A286D4}
-		{8BC2EFE9-08F8-B545-B361-6FA1814ECFF4}.0 = {53689F97-7383-CC46-823E-853D0041DB83}
+		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{A337A401-E2A4-B340-8D96-0094B8197436}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{A337A401-E2A4-B340-8D96-0094B8197436}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{531A7AD1-2589-BE42-96B0-1686543EBC86}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{531A7AD1-2589-BE42-96B0-1686543EBC86}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{A9784F09-498F-194E-96DF-47185D05CC0C}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{A9784F09-498F-194E-96DF-47185D05CC0C}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{0868390D-2298-484F-BE0A-A767FBA35014}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{0868390D-2298-484F-BE0A-A767FBA35014}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{F54FB367-9897-3941-9787-20134FAF6B1F}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{F54FB367-9897-3941-9787-20134FAF6B1F}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
+		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.1 = {EB226AE6-4232-8949-94AA-C1F6E1E0322D}
+		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.0 = {B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{53689F97-7383-CC46-823E-853D0041DB83}.Debug.ActiveCfg = Debug|Win32
-		{53689F97-7383-CC46-823E-853D0041DB83}.Debug.Build.0 = Debug|Win32
-		{53689F97-7383-CC46-823E-853D0041DB83}.Release.ActiveCfg = Release|Win32
-		{53689F97-7383-CC46-823E-853D0041DB83}.Release.Build.0 = Release|Win32
-		{37DEC458-A6EB-C44C-BA9E-B021E0A286D4}.Debug.ActiveCfg = Debug|Win32
-		{37DEC458-A6EB-C44C-BA9E-B021E0A286D4}.Debug.Build.0 = Debug|Win32
-		{37DEC458-A6EB-C44C-BA9E-B021E0A286D4}.Release.ActiveCfg = Release|Win32
-		{37DEC458-A6EB-C44C-BA9E-B021E0A286D4}.Release.Build.0 = Release|Win32
-		{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}.Debug.ActiveCfg = Debug|Win32
-		{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}.Debug.Build.0 = Debug|Win32
-		{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}.Release.ActiveCfg = Release|Win32
-		{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}.Release.Build.0 = Release|Win32
-		{64167A68-4546-D24A-B360-A12584085FF0}.Debug.ActiveCfg = Debug|Win32
-		{64167A68-4546-D24A-B360-A12584085FF0}.Debug.Build.0 = Debug|Win32
-		{64167A68-4546-D24A-B360-A12584085FF0}.Release.ActiveCfg = Release|Win32
-		{64167A68-4546-D24A-B360-A12584085FF0}.Release.Build.0 = Release|Win32
-		{75D70CB6-FC76-D64C-8518-F53C2F962B3E}.Debug.ActiveCfg = Debug|Win32
-		{75D70CB6-FC76-D64C-8518-F53C2F962B3E}.Debug.Build.0 = Debug|Win32
-		{75D70CB6-FC76-D64C-8518-F53C2F962B3E}.Release.ActiveCfg = Release|Win32
-		{75D70CB6-FC76-D64C-8518-F53C2F962B3E}.Release.Build.0 = Release|Win32
-		{DF8B1279-96C1-B540-89B5-F614542CAB49}.Debug.ActiveCfg = Debug|Win32
-		{DF8B1279-96C1-B540-89B5-F614542CAB49}.Debug.Build.0 = Debug|Win32
-		{DF8B1279-96C1-B540-89B5-F614542CAB49}.Release.ActiveCfg = Release|Win32
-		{DF8B1279-96C1-B540-89B5-F614542CAB49}.Release.Build.0 = Release|Win32
-		{E134D1F7-AA4D-864E-99DD-F34547418A48}.Debug.ActiveCfg = Debug|Win32
-		{E134D1F7-AA4D-864E-99DD-F34547418A48}.Debug.Build.0 = Debug|Win32
-		{E134D1F7-AA4D-864E-99DD-F34547418A48}.Release.ActiveCfg = Release|Win32
-		{E134D1F7-AA4D-864E-99DD-F34547418A48}.Release.Build.0 = Release|Win32
-		{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}.Debug.ActiveCfg = Debug|Win32
-		{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}.Debug.Build.0 = Debug|Win32
-		{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}.Release.ActiveCfg = Release|Win32
-		{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}.Release.Build.0 = Release|Win32
-		{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}.Debug.ActiveCfg = Debug|Win32
-		{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}.Debug.Build.0 = Debug|Win32
-		{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}.Release.ActiveCfg = Release|Win32
-		{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}.Release.Build.0 = Release|Win32
-		{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}.Debug.ActiveCfg = Debug|Win32
-		{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}.Debug.Build.0 = Debug|Win32
-		{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}.Release.ActiveCfg = Release|Win32
-		{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}.Release.Build.0 = Release|Win32
-		{18EC558B-70B1-ED4F-8365-4F6528612BEA}.Debug.ActiveCfg = Debug|Win32
-		{18EC558B-70B1-ED4F-8365-4F6528612BEA}.Debug.Build.0 = Debug|Win32
-		{18EC558B-70B1-ED4F-8365-4F6528612BEA}.Release.ActiveCfg = Release|Win32
-		{18EC558B-70B1-ED4F-8365-4F6528612BEA}.Release.Build.0 = Release|Win32
-		{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}.Debug.ActiveCfg = Debug|Win32
-		{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}.Debug.Build.0 = Debug|Win32
-		{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}.Release.ActiveCfg = Release|Win32
-		{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}.Release.Build.0 = Release|Win32
-		{06E152F1-9254-5742-824C-7FF4B6B80B77}.Debug.ActiveCfg = Debug|Win32
-		{06E152F1-9254-5742-824C-7FF4B6B80B77}.Debug.Build.0 = Debug|Win32
-		{06E152F1-9254-5742-824C-7FF4B6B80B77}.Release.ActiveCfg = Release|Win32
-		{06E152F1-9254-5742-824C-7FF4B6B80B77}.Release.Build.0 = Release|Win32
-		{DECF0DA6-966D-9247-AEFB-820735C5D33A}.Debug.ActiveCfg = Debug|Win32
-		{DECF0DA6-966D-9247-AEFB-820735C5D33A}.Debug.Build.0 = Debug|Win32
-		{DECF0DA6-966D-9247-AEFB-820735C5D33A}.Release.ActiveCfg = Release|Win32
-		{DECF0DA6-966D-9247-AEFB-820735C5D33A}.Release.Build.0 = Release|Win32
-		{6E7A09DB-FC84-CF46-A814-F9E6499D547F}.Debug.ActiveCfg = Debug|Win32
-		{6E7A09DB-FC84-CF46-A814-F9E6499D547F}.Debug.Build.0 = Debug|Win32
-		{6E7A09DB-FC84-CF46-A814-F9E6499D547F}.Release.ActiveCfg = Release|Win32
-		{6E7A09DB-FC84-CF46-A814-F9E6499D547F}.Release.Build.0 = Release|Win32
-		{A109A538-6CA8-2D4E-97B7-6F4974B55E64}.Debug.ActiveCfg = Debug|Win32
-		{A109A538-6CA8-2D4E-97B7-6F4974B55E64}.Debug.Build.0 = Debug|Win32
-		{A109A538-6CA8-2D4E-97B7-6F4974B55E64}.Release.ActiveCfg = Release|Win32
-		{A109A538-6CA8-2D4E-97B7-6F4974B55E64}.Release.Build.0 = Release|Win32
-		{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}.Debug.ActiveCfg = Debug|Win32
-		{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}.Debug.Build.0 = Debug|Win32
-		{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}.Release.ActiveCfg = Release|Win32
-		{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}.Release.Build.0 = Release|Win32
-		{D02B65D1-2568-954D-8584-AB351288E3FD}.Debug.ActiveCfg = Debug|Win32
-		{D02B65D1-2568-954D-8584-AB351288E3FD}.Debug.Build.0 = Debug|Win32
-		{D02B65D1-2568-954D-8584-AB351288E3FD}.Release.ActiveCfg = Release|Win32
-		{D02B65D1-2568-954D-8584-AB351288E3FD}.Release.Build.0 = Release|Win32
-		{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}.Debug.ActiveCfg = Debug|Win32
-		{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}.Debug.Build.0 = Debug|Win32
-		{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}.Release.ActiveCfg = Release|Win32
-		{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}.Release.Build.0 = Release|Win32
-		{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}.Debug.ActiveCfg = Debug|Win32
-		{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}.Debug.Build.0 = Debug|Win32
-		{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}.Release.ActiveCfg = Release|Win32
-		{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}.Release.Build.0 = Release|Win32
-		{8BC2EFE9-08F8-B545-B361-6FA1814ECFF4}.Debug.ActiveCfg = Debug|Win32
-		{8BC2EFE9-08F8-B545-B361-6FA1814ECFF4}.Debug.Build.0 = Debug|Win32
-		{8BC2EFE9-08F8-B545-B361-6FA1814ECFF4}.Release.ActiveCfg = Release|Win32
-		{8BC2EFE9-08F8-B545-B361-6FA1814ECFF4}.Release.Build.0 = Release|Win32
+		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Debug.ActiveCfg = Debug|Win32
+		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Debug.Build.0 = Debug|Win32
+		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Release.ActiveCfg = Release|Win32
+		{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}.Release.Build.0 = Release|Win32
+		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Debug.ActiveCfg = Debug|Win32
+		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Debug.Build.0 = Debug|Win32
+		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Release.ActiveCfg = Release|Win32
+		{EB226AE6-4232-8949-94AA-C1F6E1E0322D}.Release.Build.0 = Release|Win32
+		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Debug.ActiveCfg = Debug|Win32
+		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Debug.Build.0 = Debug|Win32
+		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Release.ActiveCfg = Release|Win32
+		{CBCCCF87-9F41-494D-800D-0A2563A477AA}.Release.Build.0 = Release|Win32
+		{A337A401-E2A4-B340-8D96-0094B8197436}.Debug.ActiveCfg = Debug|Win32
+		{A337A401-E2A4-B340-8D96-0094B8197436}.Debug.Build.0 = Debug|Win32
+		{A337A401-E2A4-B340-8D96-0094B8197436}.Release.ActiveCfg = Release|Win32
+		{A337A401-E2A4-B340-8D96-0094B8197436}.Release.Build.0 = Release|Win32
+		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Debug.ActiveCfg = Debug|Win32
+		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Debug.Build.0 = Debug|Win32
+		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Release.ActiveCfg = Release|Win32
+		{6A45A4A7-CE88-C641-B817-F081F91BE1DC}.Release.Build.0 = Release|Win32
+		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Debug.ActiveCfg = Debug|Win32
+		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Debug.Build.0 = Debug|Win32
+		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Release.ActiveCfg = Release|Win32
+		{1C8279B9-F67C-B945-A889-38EC210EDD6A}.Release.Build.0 = Release|Win32
+		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Debug.ActiveCfg = Debug|Win32
+		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Debug.Build.0 = Debug|Win32
+		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Release.ActiveCfg = Release|Win32
+		{D9B23F76-E5F9-4445-8A0B-40812467ED27}.Release.Build.0 = Release|Win32
+		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Debug.ActiveCfg = Debug|Win32
+		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Debug.Build.0 = Debug|Win32
+		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Release.ActiveCfg = Release|Win32
+		{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}.Release.Build.0 = Release|Win32
+		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Debug.ActiveCfg = Debug|Win32
+		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Debug.Build.0 = Debug|Win32
+		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Release.ActiveCfg = Release|Win32
+		{091F7848-1A66-544D-BDE9-88E67B8AE6A7}.Release.Build.0 = Release|Win32
+		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Debug.ActiveCfg = Debug|Win32
+		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Debug.Build.0 = Debug|Win32
+		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Release.ActiveCfg = Release|Win32
+		{E658F4EA-7900-8044-8C32-D07DBAD35DB5}.Release.Build.0 = Release|Win32
+		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Debug.ActiveCfg = Debug|Win32
+		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Debug.Build.0 = Debug|Win32
+		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Release.ActiveCfg = Release|Win32
+		{531A7AD1-2589-BE42-96B0-1686543EBC86}.Release.Build.0 = Release|Win32
+		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Debug.ActiveCfg = Debug|Win32
+		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Debug.Build.0 = Debug|Win32
+		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Release.ActiveCfg = Release|Win32
+		{DA94F34F-E7CA-484C-8A33-8E00CA237116}.Release.Build.0 = Release|Win32
+		{A9784F09-498F-194E-96DF-47185D05CC0C}.Debug.ActiveCfg = Debug|Win32
+		{A9784F09-498F-194E-96DF-47185D05CC0C}.Debug.Build.0 = Debug|Win32
+		{A9784F09-498F-194E-96DF-47185D05CC0C}.Release.ActiveCfg = Release|Win32
+		{A9784F09-498F-194E-96DF-47185D05CC0C}.Release.Build.0 = Release|Win32
+		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Debug.ActiveCfg = Debug|Win32
+		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Debug.Build.0 = Debug|Win32
+		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Release.ActiveCfg = Release|Win32
+		{15972BB0-7EA1-B24B-975F-5D0AEBD45224}.Release.Build.0 = Release|Win32
+		{0868390D-2298-484F-BE0A-A767FBA35014}.Debug.ActiveCfg = Debug|Win32
+		{0868390D-2298-484F-BE0A-A767FBA35014}.Debug.Build.0 = Debug|Win32
+		{0868390D-2298-484F-BE0A-A767FBA35014}.Release.ActiveCfg = Release|Win32
+		{0868390D-2298-484F-BE0A-A767FBA35014}.Release.Build.0 = Release|Win32
+		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Debug.ActiveCfg = Debug|Win32
+		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Debug.Build.0 = Debug|Win32
+		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Release.ActiveCfg = Release|Win32
+		{3F177A7C-92B8-BB4E-B414-D892C2B5266B}.Release.Build.0 = Release|Win32
+		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Debug.ActiveCfg = Debug|Win32
+		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Debug.Build.0 = Debug|Win32
+		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Release.ActiveCfg = Release|Win32
+		{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}.Release.Build.0 = Release|Win32
+		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Debug.ActiveCfg = Debug|Win32
+		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Debug.Build.0 = Debug|Win32
+		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Release.ActiveCfg = Release|Win32
+		{BF5BC703-2F23-EF4A-850D-09BF66542A42}.Release.Build.0 = Release|Win32
+		{F54FB367-9897-3941-9787-20134FAF6B1F}.Debug.ActiveCfg = Debug|Win32
+		{F54FB367-9897-3941-9787-20134FAF6B1F}.Debug.Build.0 = Debug|Win32
+		{F54FB367-9897-3941-9787-20134FAF6B1F}.Release.ActiveCfg = Release|Win32
+		{F54FB367-9897-3941-9787-20134FAF6B1F}.Release.Build.0 = Release|Win32
+		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Debug.ActiveCfg = Debug|Win32
+		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Debug.Build.0 = Debug|Win32
+		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Release.ActiveCfg = Release|Win32
+		{DFE3CE67-3550-8F44-996E-B5302D9A14FC}.Release.Build.0 = Release|Win32
+		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Debug.ActiveCfg = Debug|Win32
+		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Debug.Build.0 = Debug|Win32
+		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Release.ActiveCfg = Release|Win32
+		{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: branches/new_build/build/vs2002/ode.vcproj
===================================================================
--- branches/new_build/build/vs2002/ode.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/ode.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="ode"
-	ProjectGUID="{53689F97-7383-CC46-823E-853D0041DB83}"
+	ProjectGUID="{B6A2B1D3-EDB0-4C40-9C91-3ABFA2C81E88}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -73,7 +73,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_I.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_I.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_I.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_I"
-	ProjectGUID="{18EC558B-70B1-ED4F-8365-4F6528612BEA}"
+	ProjectGUID="{531A7AD1-2589-BE42-96B0-1686543EBC86}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_boxstack.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_boxstack.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_boxstack.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_boxstack"
-	ProjectGUID="{E553EAB6-A59E-354B-A1E9-F3D3AE5A5221}"
+	ProjectGUID="{CBCCCF87-9F41-494D-800D-0A2563A477AA}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_buggy.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_buggy.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_buggy.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_buggy"
-	ProjectGUID="{64167A68-4546-D24A-B360-A12584085FF0}"
+	ProjectGUID="{A337A401-E2A4-B340-8D96-0094B8197436}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_chain1.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_chain1.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_chain1.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_chain1"
-	ProjectGUID="{75D70CB6-FC76-D64C-8518-F53C2F962B3E}"
+	ProjectGUID="{6A45A4A7-CE88-C641-B817-F081F91BE1DC}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_chain2.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_chain2.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_chain2.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_chain2"
-	ProjectGUID="{DF8B1279-96C1-B540-89B5-F614542CAB49}"
+	ProjectGUID="{1C8279B9-F67C-B945-A889-38EC210EDD6A}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_collision.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_collision.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_collision.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_collision"
-	ProjectGUID="{E134D1F7-AA4D-864E-99DD-F34547418A48}"
+	ProjectGUID="{D9B23F76-E5F9-4445-8A0B-40812467ED27}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_crash.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_crash.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_crash.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_crash"
-	ProjectGUID="{FC4B5F61-CFFD-7C4B-86D4-C112CB96E208}"
+	ProjectGUID="{EC5CA0BB-DCDB-044E-8442-9B04CFB5BC69}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_cyl.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_cyl.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_cyl.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_cyl"
-	ProjectGUID="{D02B65D1-2568-954D-8584-AB351288E3FD}"
+	ProjectGUID="{BF5BC703-2F23-EF4A-850D-09BF66542A42}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_friction.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_friction.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_friction.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_friction"
-	ProjectGUID="{A18D17D0-1AB8-F24B-BCE2-F4C93E5915E6}"
+	ProjectGUID="{091F7848-1A66-544D-BDE9-88E67B8AE6A7}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_hinge.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_hinge.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_hinge.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_hinge"
-	ProjectGUID="{6B757E19-6864-5E4C-9E0D-AF1A4A3386B1}"
+	ProjectGUID="{E658F4EA-7900-8044-8C32-D07DBAD35DB5}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_joints.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_joints.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_joints.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_joints"
-	ProjectGUID="{4259F2C1-9FD2-E54F-A9A8-82D09F3CDCD2}"
+	ProjectGUID="{DA94F34F-E7CA-484C-8A33-8E00CA237116}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_moving_trimesh.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_moving_trimesh.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_moving_trimesh.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_moving_trimesh"
-	ProjectGUID="{7264C4AF-AA98-EB4A-90ED-FB99D90FCC5A}"
+	ProjectGUID="{F54FB367-9897-3941-9787-20134FAF6B1F}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_ode.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_ode.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_ode.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_ode"
-	ProjectGUID="{06E152F1-9254-5742-824C-7FF4B6B80B77}"
+	ProjectGUID="{A9784F09-498F-194E-96DF-47185D05CC0C}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_slider.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_slider.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_slider.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_slider"
-	ProjectGUID="{DECF0DA6-966D-9247-AEFB-820735C5D33A}"
+	ProjectGUID="{15972BB0-7EA1-B24B-975F-5D0AEBD45224}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_space.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_space.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_space.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_space"
-	ProjectGUID="{6E7A09DB-FC84-CF46-A814-F9E6499D547F}"
+	ProjectGUID="{0868390D-2298-484F-BE0A-A767FBA35014}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_space_stress.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_space_stress.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_space_stress.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_space_stress"
-	ProjectGUID="{A109A538-6CA8-2D4E-97B7-6F4974B55E64}"
+	ProjectGUID="{3F177A7C-92B8-BB4E-B414-D892C2B5266B}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_step.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_step.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_step.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_step"
-	ProjectGUID="{9B47AE48-B4AE-6E43-9687-8A0EFB08B748}"
+	ProjectGUID="{4764CE4A-92DF-2340-BBAC-F7D6DA86ECB1}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/test_trimesh.vcproj
===================================================================
--- branches/new_build/build/vs2002/test_trimesh.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/test_trimesh.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="test_trimesh"
-	ProjectGUID="{493E9BDC-E2B4-8345-9A03-6A71DC1EE620}"
+	ProjectGUID="{DFE3CE67-3550-8F44-996E-B5302D9A14FC}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2002/tests.vcproj
===================================================================
--- branches/new_build/build/vs2002/tests.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2002/tests.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="tests"
-	ProjectGUID="{8BC2EFE9-08F8-B545-B361-6FA1814ECFF4}"
+	ProjectGUID="{F17028E3-9B8E-294C-AAEB-12D8F5ADE9B1}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -74,7 +74,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2003/drawstuff.vcproj
===================================================================
--- branches/new_build/build/vs2003/drawstuff.vcproj	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2003/drawstuff.vcproj	2006-03-20 19:07:44 UTC (rev 866)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="drawstuff"
-	ProjectGUID="{B91D84A3-359A-284A-B005-59430B34FF3C}"
+	ProjectGUID="{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"/>
@@ -72,7 +72,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="0"/>

Modified: branches/new_build/build/vs2003/ode.sln
===================================================================
--- branches/new_build/build/vs2003/ode.sln	2006-03-20 18:09:40 UTC (rev 865)
+++ branches/new_build/build/vs2003/ode.sln	2006-03-20 19:07:44 UTC (rev 866)
@@ -1,123 +1,123 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{ADD404A1-C002-0143-8B4B-4002E4658ED0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "./ode.vcproj", "{E307AE68-4773-DE48-810B-308CDEC0A242}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{B91D84A3-359A-284A-B005-59430B34FF3C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drawstuff", "./drawstuff.vcproj", "{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{4BD729C5-1EEB-8C48-8913-6060F688D86F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_boxstack", "./test_boxstack.vcproj", "{31CD83BB-AD1B-824D-AAF4-A607801470F2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A} = {D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{61946EC9-B7E6-1841-8FFD-9F65F3EC6302}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_buggy", "./test_buggy.vcproj", "{1B86C836-7C5B-0348-9652-20DFE8223FA7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A} = {D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{72667F97-E9FE-9341-93BD-AA6E6327F8CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain1", "./test_chain1.vcproj", "{FC05793E-F7F9-8F42-8B41-C90AEE674209}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A} = {D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{E6595306-6711-DA43-B35A-3722000050E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chain2", "./test_chain2.vcproj", "{D6F9501D-5B6F-3646-968C-0D92A528EE47}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A} = {D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{AE65167C-7F06-4347-9342-4A48C44B25C0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_collision", "./test_collision.vcproj", "{ACCB04C0-C571-AF40-B1A0-5E28B464E6EB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A} = {D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{313005ED-B54D-7A44-A26B-CEBBD95883D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_crash", "./test_crash.vcproj", "{E4B3EC66-51F0-E04E-9923-0ED43F2B0ECC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A} = {D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{7553055D-246A-324E-A03B-DC39AF684400}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_friction", "./test_friction.vcproj", "{C13A1AB1-3D29-BE40-B70C-928318C21272}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-2A41-AA7D-7387720F9E1A} = {D76CE1A7-89E5-2A41-AA7D-7387720F9E1A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{3F5F13E3-89F1-514D-B000-9EFC2713C1F5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_hinge", "./test_hinge.vcproj", "{439E720D-1354-6149-832E-C0BDB713E3F0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{ADD404A1-C002-0143-8B4B-4002E4658ED0} = {ADD404A1-C002-0143-8B4B-4002E4658ED0}
-		{B91D84A3-359A-284A-B005-59430B34FF3C} = {B91D84A3-359A-284A-B005-59430B34FF3C}
+		{E307AE68-4773-DE48-810B-308CDEC0A242} = {E307AE68-4773-DE48-810B-308CDEC0A242}
+		{D76CE1A7-89E5-...
 
[truncated message content]

[Opende-svn] SF.net SVN: opende: [865] branches/new_build

[<jas...@us...>]

Revision: 865
Author:   jason379
Date:     2006-03-20 10:09:40 -0800 (Mon, 20 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=865&view=rev

Log Message:
-----------
Added config-default.h for VS build system. 

Modified Paths:
--------------
    branches/new_build/CHANGELOG
    branches/new_build/build/README.txt

Added Paths:
-----------
    branches/new_build/build/config-default.h
Modified: branches/new_build/CHANGELOG
===================================================================
--- branches/new_build/CHANGELOG	2006-03-20 17:48:40 UTC (rev 864)
+++ branches/new_build/CHANGELOG	2006-03-20 18:09:40 UTC (rev 865)
@@ -8,6 +8,10 @@
   * keep the format consistent (79 char width, M/D/Y date format).
 
 ------------------------------------------------------------------------------
+03/20/06 jason379
+
+	* Added new autogenerated Visual Studio projects, with Premake scripts
+	
 02/04/06 gcarlton
 
 	* Added support for geom offsets.
@@ -46,7 +50,7 @@
 09/22/04 jeff
 
 	* Assorted small bugfixes and tweaks for
-          trimesh_{box,ccylinder,trimesh} collisions
+	  trimesh_{box,ccylinder,trimesh} collisions
 
 09/21/04 jeff
 

Modified: branches/new_build/build/README.txt
===================================================================
--- branches/new_build/build/README.txt	2006-03-20 17:48:40 UTC (rev 864)
+++ branches/new_build/build/README.txt	2006-03-20 18:09:40 UTC (rev 865)
@@ -2,7 +2,12 @@
 Contributed by Jason Perkins (jas...@us...)
 -------------------------------------------------------------------
 
-This is my first take. It works fairly well, but hasn't been 
-thorougly tested yet. Once I'm convinced the system is reasonably
-bulletproof I will write up additional documentation, including
-how to generate custom project files.
+SVN USERS: Before using these project files you must copy
+config-default.h to ode/include/ode/config.h. 
+
+This is my first take on a replacement set of Visual Studio project
+files. They work fairly well, but have not been thorougly tested 
+yet. Once I'm convinced the system is reasonably bulletproof I will 
+write up additional documentation, including how to generate custom 
+project files, and merge everything into the project trunk.
+

Added: branches/new_build/build/config-default.h
===================================================================
--- branches/new_build/build/config-default.h	                        (rev 0)
+++ branches/new_build/build/config-default.h	2006-03-20 18:09:40 UTC (rev 865)
@@ -0,0 +1,121 @@
+/* This file was autogenerated by Premake */
+#ifndef _ODE_CONFIG_H_
+#define _ODE_CONFIG_H_
+
+/* Try to identify the platform */
+#if defined(_MSC_VER) || defined(__CYGWIN32__) || defined(__MINGW32__)
+  #define ODE_PLATFORM_WINDOWS
+#elif defined(__linux__)
+  #define ODE_PLATFORM_LINUX
+#elif defined(__APPLE__) && defined(__MACH__)
+  #define ODE_PLATFORM_OSX
+#else
+  #error "Need some help identifying the platform!"
+#endif
+
+/* Additional platform defines used in the code */
+#if defined(ODE_PLATFORM_WINDOWS) && !defined(WIN32)
+  #define WIN32
+#endif
+
+#if defined(__CYGWIN32__) || defined(__MINGW32__)
+  #define CYGWIN
+#endif
+
+#if defined(ODE_PLATFORM_OSX)
+  #define macintosh
+#endif
+
+
+/* Define a DLL export symbol for those platforms that need it */
+#if defined(ODE_PLATFORM_WINDOWS)
+  #if defined(ODE_DLL_EXPORT)
+    #define ODE_API __declspec(dllexport)
+  #else
+    #define ODE_API __declspec(dllimport)
+  #endif
+#else
+  #define ODE_API
+#endif
+
+
+/* Pull in the standard headers */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <malloc.h>
+#include <math.h>
+#include <string.h>
+#include <float.h>
+
+#if !defined(ODE_PLATFORM_WINDOWS)
+  #include <alloca.h>
+#endif
+
+
+/* Visual C does not define these functions */
+#if defined(_MSC_VER)
+  #define copysignf _copysign
+  #define copysign _copysign
+#endif
+
+
+/* Define a value for infinity */
+#if defined(HUGE_VALF)
+	#define ODE_INFINITY4 HUGE_VALF
+	#define ODE_INFINITY8 HUGE_VAL
+#elif defined(FLT_MAX)
+	#define ODE_INFINITY4 FLT_MAX
+	#define ODE_INFINITY8 DBL_MAX
+#else
+	static union { unsigned char __c[4]; float  __f; }  __ode_huge_valf = {{0,0,0x80,0x7f}};
+	static union { unsigned char __c[8]; double __d; }  __ode_huge_val  = {{0,0,0,0,0,0,0xf0,0x7f}};
+	#define ODE_INFINITY4 (__ode_huge_valf.__f)
+	#define ODE_INFINITY8 (__ode_huge_val.__d)
+#endif
+
+
+/* Well-defined common data types...need to define for 64 bit systems */
+#if defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
+  #define X86_64_SYSTEM   1
+  typedef int             int32;
+  typedef unsigned int    uint32;
+  typedef short           int16;
+  typedef unsigned short  uint16;
+  typedef char            int8;
+  typedef unsigned char   uint8;
+#else
+  typedef int             int32;
+  typedef unsigned int    uint32;
+  typedef short           int16;
+  typedef unsigned short  uint16;
+  typedef char            int8;
+  typedef unsigned char   uint8;
+#endif
+
+/* An integer type that can be safely cast to a pointer. This definition
+ * should be safe even on 64-bit systems */
+typedef size_t intP;
+
+
+/* The efficient alignment. most platforms align data structures to some
+ * number of bytes, but this is not always the most efficient alignment.
+ * for example, many x86 compilers align to 4 bytes, but on a pentium it is
+ * important to align doubles to 8 byte boundaries (for speed), and the 4
+ * floats in a SIMD register to 16 byte boundaries. many other platforms have
+ * similar behavior. setting a larger alignment can waste a (very) small
+ * amount of memory. NOTE: this number must be a power of two. */
+#define EFFICIENT_ALIGNMENT 16
+
+
+/* Define this if your system supports anonymous memory maps (linux does) */
+#define MMAP_ANONYMOUS
+
+/* Configuration options */
+#define dSINGLE 1
+#define dInfinity ODE_INFINITY4
+#define dEpsilon FLT_EPSILON
+#define dCYLINDER_ENABLED 1
+#define dTRIMESH_ENABLED 1
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opende-svn] SF.net SVN: opende: [864] branches/new_build/ode/src

[<jas...@us...>]

Revision: 864
Author:   jason379
Date:     2006-03-20 09:48:40 -0800 (Mon, 20 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=864&view=rev

Log Message:
-----------
Merged with trunk (r861:863)

Modified Paths:
--------------
    branches/new_build/contrib/TerrainAndCone/readme.txt
    branches/new_build/drawstuff/src/drawstuff.cpp
    branches/new_build/include/drawstuff/drawstuff.h
    branches/new_build/include/ode/collision.h
    branches/new_build/include/ode/mass.h
    branches/new_build/include/ode/odecpp_collision.h
    branches/new_build/ode/doc/ode.doc
    branches/new_build/ode/src/collision_cylinder_trimesh.cpp
    branches/new_build/ode/src/collision_kernel.cpp
    branches/new_build/ode/src/collision_std.cpp
    branches/new_build/ode/src/collision_std.h
    branches/new_build/ode/src/collision_trimesh.cpp
    branches/new_build/ode/src/collision_trimesh_ccylinder.cpp
    branches/new_build/ode/src/collision_trimesh_internal.h
    branches/new_build/ode/src/export-dif.cpp
    branches/new_build/ode/src/mass.cpp
    branches/new_build/ode/test/test_I.cpp
    branches/new_build/ode/test/test_boxstack.cpp
    branches/new_build/ode/test/test_buggy.cpp
    branches/new_build/ode/test/test_chain1.c
    branches/new_build/ode/test/test_chain2.cpp
    branches/new_build/ode/test/test_collision.cpp
    branches/new_build/ode/test/test_crash.cpp
    branches/new_build/ode/test/test_friction.cpp
    branches/new_build/ode/test/test_moving_trimesh.cpp
    branches/new_build/ode/test/test_ode.cpp
    branches/new_build/ode/test/test_space.cpp
    branches/new_build/ode/test/test_space_stress.cpp
    branches/new_build/ode/test/test_step.cpp
    branches/new_build/ode/test/test_trimesh.cpp
Modified: branches/new_build/contrib/TerrainAndCone/readme.txt
===================================================================
--- branches/new_build/contrib/TerrainAndCone/readme.txt	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/contrib/TerrainAndCone/readme.txt	2006-03-20 17:48:40 UTC (rev 864)
@@ -26,11 +26,14 @@
 
 *** add to folder ode\src:
 
-dCone.cpp
+dCone.cpp        
 dTerrainY.cpp 
 dTerrainZ.cpp 
 collision_std_internal.h
 
+On linux => edit each .cpp file and comment out     #include "windows.h"    &    #include "ode\ode.h"
+
+
 *** add to drawstuff\src\drawstuff.cpp:
 
 static void drawCone(float l, float r)
@@ -281,7 +284,7 @@
 #define dLENGTHSQUARED(a) \
 	(((a)[0])*((a)[0]) + ((a)[1])*((a)[1]) + ((a)[2])*((a)[2]));
 
-*** add in ode\src\collision_kernel.cpp line 137:
+*** add in ode\src\collision_kernel.cpp function  'static void initColliders()'  next to other 'setCollider' calls:
   setCollider (dTerrainYClass,dSphereClass,&dCollideTerrainY);
   setCollider (dTerrainYClass,dBoxClass,&dCollideTerrainY);
   setCollider (dTerrainYClass,dCCylinderClass,&dCollideTerrainY);
@@ -313,6 +316,7 @@
 int dCollideTriMeshCone(dxGeom *o1, dxGeom *o2, int flags, dContactGeom *contact, int skip);
 
 *** add dCone.cpp, dTerrainY.cpp and dTerrainZ.cpp to the the ODE_SRC variable in the makefile
+On Linux => add dCone.cpp, dTerrainY.cpp and dTerrainZ.cpp to the the libode_a_SOURCES variable in the ode/src/Makefile.am file.
 
 *** now you can now test using file test_boxstackb.cpp (to add in folder ode\test).
 

Modified: branches/new_build/drawstuff/src/drawstuff.cpp
===================================================================
--- branches/new_build/drawstuff/src/drawstuff.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/drawstuff/src/drawstuff.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -605,7 +605,7 @@
 
 static int capped_cylinder_quality = 3;
 
-static void drawCappedCylinder (float l, float r)
+static void drawCapsule (float l, float r)
 {
   int i,j;
   float tmp,nx,ny,nz,start_nx,start_ny,a,ca,sa;
@@ -1404,21 +1404,21 @@
 }
 
 
-extern "C" void dsDrawCappedCylinder (const float pos[3], const float R[12],
+extern "C" void dsDrawCapsule (const float pos[3], const float R[12],
 				      float length, float radius)
 {
   if (current_state != 2) dsError ("drawing function called outside simulation loop");
   setupDrawingMode();
   glShadeModel (GL_SMOOTH);
   setTransform (pos,R);
-  drawCappedCylinder (length,radius);
+  drawCapsule (length,radius);
   glPopMatrix();
 
   if (use_shadows) {
     setShadowDrawingMode();
     setShadowTransform();
     setTransform (pos,R);
-    drawCappedCylinder (length,radius);
+    drawCapsule (length,radius);
     glPopMatrix();
     glPopMatrix();
     glDepthRange (0,1);
@@ -1490,14 +1490,14 @@
 }
 
 
-void dsDrawCappedCylinderD (const double pos[3], const double R[12],
+void dsDrawCapsuleD (const double pos[3], const double R[12],
 			    float length, float radius)
 {
   int i;
   float pos2[3],R2[12];
   for (i=0; i<3; i++) pos2[i]=(float)pos[i];
   for (i=0; i<12; i++) R2[i]=(float)R[i];
-  dsDrawCappedCylinder (pos2,R2,length,radius);
+  dsDrawCapsule (pos2,R2,length,radius);
 }
 
 
@@ -1517,7 +1517,7 @@
 }
 
 
-void dsSetCappedCylinderQuality (int n)
+void dsSetCapsuleQuality (int n)
 {
   capped_cylinder_quality = n;
 }

Modified: branches/new_build/include/drawstuff/drawstuff.h
===================================================================
--- branches/new_build/include/drawstuff/drawstuff.h	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/include/drawstuff/drawstuff.h	2006-03-20 17:48:40 UTC (rev 864)
@@ -129,8 +129,8 @@
 		     const float *v0, const float *v1, const float *v2, int solid);
 void dsDrawCylinder (const float pos[3], const float R[12],
 		     float length, float radius);
-void dsDrawCappedCylinder (const float pos[3], const float R[12],
-			   float length, float radius);
+void dsDrawCapsule (const float pos[3], const float R[12],
+		    float length, float radius);
 void dsDrawLine (const float pos1[3], const float pos2[3]);
 void dsDrawConvex(const float pos[3], const float R[12],
 		  float *_planes,
@@ -149,8 +149,8 @@
 		      const double *v0, const double *v1, const double *v2, int solid);
 void dsDrawCylinderD (const double pos[3], const double R[12],
 		      float length, float radius);
-void dsDrawCappedCylinderD (const double pos[3], const double R[12],
-			    float length, float radius);
+void dsDrawCapsuleD (const double pos[3], const double R[12],
+		     float length, float radius);
 void dsDrawLineD (const double pos1[3], const double pos2[3]);
 
 /* Set the drawn quality of the objects. Higher numbers are higher quality,
@@ -158,9 +158,15 @@
  * be effective.
  */
 void dsSetSphereQuality (int n);		/* default = 1 */
-void dsSetCappedCylinderQuality (int n);	/* default = 3 */
+void dsSetCapsuleQuality (int n);		/* default = 3 */
 
+// Backwards compatible API
+#define dsDrawCappedCylinder dsDrawCapsule
+#define dsDrawCappedCylinderD dsDrawCapsuleD
+#define dsSetCappedCylinderQuality dsSetCapsuleQuality
 
+
+
 /* closing bracket for extern "C" */
 #ifdef __cplusplus
 }

Modified: branches/new_build/include/ode/collision.h
===================================================================
--- branches/new_build/include/ode/collision.h	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/include/ode/collision.h	2006-03-20 17:48:40 UTC (rev 864)
@@ -93,7 +93,7 @@
 enum {
   dSphereClass = 0,
   dBoxClass,
-  dCCylinderClass,
+  dCapsuleClass,
   dCylinderClass,
   dPlaneClass,
   dRayClass,
@@ -127,11 +127,18 @@
 ODE_API void dGeomPlaneGetParams (dGeomID plane, dVector4 result);
 ODE_API dReal dGeomPlanePointDepth (dGeomID plane, dReal x, dReal y, dReal z);
 
-ODE_API dGeomID dCreateCCylinder (dSpaceID space, dReal radius, dReal length);
-ODE_API void dGeomCCylinderSetParams (dGeomID ccylinder, dReal radius, dReal length);
-ODE_API void dGeomCCylinderGetParams (dGeomID ccylinder, dReal *radius, dReal *length);
-ODE_API dReal dGeomCCylinderPointDepth (dGeomID ccylinder, dReal x, dReal y, dReal z);
+ODE_API dGeomID dCreateCapsule (dSpaceID space, dReal radius, dReal length);
+ODE_API void dGeomCapsuleSetParams (dGeomID ccylinder, dReal radius, dReal length);
+ODE_API void dGeomCapsuleGetParams (dGeomID ccylinder, dReal *radius, dReal *length);
+ODE_API dReal dGeomCapsulePointDepth (dGeomID ccylinder, dReal x, dReal y, dReal z);
 
+// For now we want to have a backwards compatible C-API, note: C++ API is not.
+#define dCreateCCylinder dCreateCapsule
+#define dGeomCCylinderSetParams dGeomCapsuleSetParams
+#define dGeomCCylinderGetParams dGeomCapsuleGetParams
+#define dGeomCCylinderPointDepth dGeomCapsulePointDepth
+#define dCCylinderClass dCapsuleClass
+
 #ifdef dCYLINDER_ENABLED
 ODE_API dGeomID dCreateCylinder (dSpaceID space, dReal radius, dReal length);
 ODE_API void dGeomCylinderSetParams (dGeomID cylinder, dReal radius, dReal length);

Modified: branches/new_build/include/ode/mass.h
===================================================================
--- branches/new_build/include/ode/mass.h	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/include/ode/mass.h	2006-03-20 17:48:40 UTC (rev 864)
@@ -43,10 +43,10 @@
 ODE_API void dMassSetSphere (dMass *, dReal density, dReal radius);
 ODE_API void dMassSetSphereTotal (dMass *, dReal total_mass, dReal radius);
 
-ODE_API void dMassSetCappedCylinder (dMass *, dReal density, int direction,
-			     dReal radius, dReal length);
-ODE_API void dMassSetCappedCylinderTotal (dMass *, dReal total_mass, int direction,
-				  dReal radius, dReal length);
+ODE_API void dMassSetCapsule (dMass *, dReal density, int direction,
+		  	dReal radius, dReal length);
+ODE_API void dMassSetCapsuleTotal (dMass *, dReal total_mass, int direction,
+			dReal radius, dReal length);
 
 ODE_API void dMassSetCylinder (dMass *, dReal density, int direction,
 		       dReal radius, dReal length);
@@ -66,6 +66,9 @@
 
 ODE_API void dMassAdd (dMass *a, const dMass *b);
 
+// Backwards compatible API
+#define dMassSetCappedCylinder dMassSetCapsule
+#define dMassSetCappedCylinderTotal dMassSetCapsuleTotal
 
 
 struct dMass {
@@ -84,8 +87,10 @@
     { dMassSetParameters (this,themass,cgx,cgy,cgz,I11,I22,I33,I12,I13,I23); }
   void setSphere (dReal density, dReal radius)
     { dMassSetSphere (this,density,radius); }
+  void setCapsule (dReal density, int direction, dReal a, dReal b)
+    { dMassSetCappedCylinder (this,density,direction,a,b); }
   void setCappedCylinder (dReal density, int direction, dReal a, dReal b)
-    { dMassSetCappedCylinder (this,density,direction,a,b); }
+    { setCapsule(density, direction, a, b); }
   void setBox (dReal density, dReal lx, dReal ly, dReal lz)
     { dMassSetBox (this,density,lx,ly,lz); }
   void adjust (dReal newmass)

Modified: branches/new_build/include/ode/odecpp_collision.h
===================================================================
--- branches/new_build/include/ode/odecpp_collision.h	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/include/ode/odecpp_collision.h	2006-03-20 17:48:40 UTC (rev 864)
@@ -252,25 +252,25 @@
 };
 
 
-class dCCylinder : public dGeom {
+class dCapsule : public dGeom {
   // intentionally undefined, don't use these
-  dCCylinder (dCCylinder &);
-  void operator= (dCCylinder &);
+  dCapsule (dCapsule &);
+  void operator= (dCapsule &);
 
 public:
-  dCCylinder() { }
-  dCCylinder (dSpaceID space, dReal radius, dReal length)
-    { _id = dCreateCCylinder (space,radius,length); }
+  dCapsule() { }
+  dCapsule (dSpaceID space, dReal radius, dReal length)
+    { _id = dCreateCapsule (space,radius,length); }
 
   void create (dSpaceID space, dReal radius, dReal length) {
     if (_id) dGeomDestroy (_id);
-    _id = dCreateCCylinder (space,radius,length);
+    _id = dCreateCapsule (space,radius,length);
   }
 
   void setParams (dReal radius, dReal length)
-    { dGeomCCylinderSetParams (_id, radius, length); }
+    { dGeomCapsuleSetParams (_id, radius, length); }
   void getParams (dReal *radius, dReal *length) const
-    { dGeomCCylinderGetParams (_id,radius,length); }
+    { dGeomCapsuleGetParams (_id,radius,length); }
 };
 
 

Modified: branches/new_build/ode/doc/ode.doc
===================================================================
--- branches/new_build/ode/doc/ode.doc	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/doc/ode.doc	2006-03-20 17:48:40 UTC (rev 864)
@@ -3011,7 +3011,7 @@
 
 @constdef{dSphereClass}{Sphere}
 @constdef{dBoxClass}{Box}
-@constdef{dCCylinderClass}{Capped cylinder}
+@constdef{dCapsuleClass}{Capped cylinder}
 @constdef{dCylinderClass}{Regular flat-ended cylinder}
 @constdef{dPlaneClass}{Infinite plane (non-placeable)}
 @constdef{dGeomTransformClass}{Geometry transform}
@@ -3604,7 +3604,7 @@
 @subsection{Capped Cylinder Class}
 
 @funcdef{
-dGeomID dCreateCCylinder (dSpaceID space, dReal radius, dReal length);
+dGeomID dCreateCapsule (dSpaceID space, dReal radius, dReal length);
 }{
 Create a capped cylinder geom of the given parameters, and return
 its ID.
@@ -3621,7 +3621,7 @@
 
 
 @funcdef{
-void dGeomCCylinderSetParams (dGeomID ccylinder,
+void dGeomCapsuleSetParams (dGeomID ccylinder,
                               dReal radius, dReal length);
 }{
 Set the parameters of the given capped cylinder.
@@ -3629,7 +3629,7 @@
 
 
 @funcdef{
-void dGeomCCylinderGetParams (dGeomID ccylinder,
+void dGeomCapsuleGetParams (dGeomID ccylinder,
                               dReal *radius, dReal *length);
 }{
 Return in @arg{radius} and @arg{length} the parameters of the given capped
@@ -3638,7 +3638,7 @@
 
 
 @funcdef{
-dReal dGeomCCylinderPointDepth (dGeomID ccylinder,
+dReal dGeomCapsulePointDepth (dGeomID ccylinder,
                                 dReal x, dReal y, dReal z);
 }{
 Return the depth of the point (@arg{x},@arg{y},@arg{z}) in the given capped

Modified: branches/new_build/ode/src/collision_cylinder_trimesh.cpp
===================================================================
--- branches/new_build/ode/src/collision_cylinder_trimesh.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/collision_cylinder_trimesh.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -953,10 +953,10 @@
 	obbRot[1][2] = cData.mCylinderRot[9];
 	obbRot[2][2] = cData.mCylinderRot[10];
 
-	OBB obbCCylinder(cCenter,cExtents,obbRot);
+	OBB obbCapsule(cCenter,cExtents,obbRot);
 
-	Matrix4x4 CCylinderMatrix;
-	MakeMatrix(cData.vCylinderPos, cData.mCylinderRot, CCylinderMatrix);
+	Matrix4x4 CapsuleMatrix;
+	MakeMatrix(cData.vCylinderPos, cData.mCylinderRot, CapsuleMatrix);
 
 	Matrix4x4 MeshMatrix;
 	MakeMatrix(cData.vTrimeshPos, cData.mTrimeshRot, MeshMatrix);
@@ -984,12 +984,12 @@
 
 		// Intersect
 		Collider.SetTemporalCoherence(true);
-		Collider.Collide(*BoxTC, obbCCylinder, cData.gTrimesh->Data->BVTree, null, &MeshMatrix);
+		Collider.Collide(*BoxTC, obbCapsule, cData.gTrimesh->Data->BVTree, null, &MeshMatrix);
 	}
 	else 
 	{
 		Collider.SetTemporalCoherence(false);
-		Collider.Collide(dxTriMesh::defaultBoxCache, obbCCylinder, cData.gTrimesh->Data->BVTree, null,&MeshMatrix);
+		Collider.Collide(dxTriMesh::defaultBoxCache, obbCapsule, cData.gTrimesh->Data->BVTree, null,&MeshMatrix);
 	}
 
 	// Retrieve data

Modified: branches/new_build/ode/src/collision_kernel.cpp
===================================================================
--- branches/new_build/ode/src/collision_kernel.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/collision_kernel.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -171,20 +171,20 @@
   setCollider (dSphereClass,dPlaneClass,&dCollideSpherePlane);
   setCollider (dBoxClass,dBoxClass,&dCollideBoxBox);
   setCollider (dBoxClass,dPlaneClass,&dCollideBoxPlane);
-  setCollider (dCCylinderClass,dSphereClass,&dCollideCCylinderSphere);
-  setCollider (dCCylinderClass,dBoxClass,&dCollideCCylinderBox);
-  setCollider (dCCylinderClass,dCCylinderClass,&dCollideCCylinderCCylinder);
-  setCollider (dCCylinderClass,dPlaneClass,&dCollideCCylinderPlane);
+  setCollider (dCapsuleClass,dSphereClass,&dCollideCapsuleSphere);
+  setCollider (dCapsuleClass,dBoxClass,&dCollideCapsuleBox);
+  setCollider (dCapsuleClass,dCapsuleClass,&dCollideCapsuleCapsule);
+  setCollider (dCapsuleClass,dPlaneClass,&dCollideCapsulePlane);
   setCollider (dRayClass,dSphereClass,&dCollideRaySphere);
   setCollider (dRayClass,dBoxClass,&dCollideRayBox);
-  setCollider (dRayClass,dCCylinderClass,&dCollideRayCCylinder);
+  setCollider (dRayClass,dCapsuleClass,&dCollideRayCapsule);
   setCollider (dRayClass,dPlaneClass,&dCollideRayPlane);
 #ifdef dTRIMESH_ENABLED
   setCollider (dTriMeshClass,dSphereClass,&dCollideSTL);
   setCollider (dTriMeshClass,dBoxClass,&dCollideBTL);
   setCollider (dTriMeshClass,dRayClass,&dCollideRTL);
   setCollider (dTriMeshClass,dTriMeshClass,&dCollideTTL);
-  setCollider (dTriMeshClass,dCCylinderClass,&dCollideCCTL);
+  setCollider (dTriMeshClass,dCapsuleClass,&dCollideCCTL);
 #ifdef dCYLINDER_ENABLED
   setCollider (dCylinderClass,dTriMeshClass,&dCollideCylinderTrimesh);
 #endif

Modified: branches/new_build/ode/src/collision_std.cpp
===================================================================
--- branches/new_build/ode/src/collision_std.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/collision_std.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -59,9 +59,9 @@
 };
 
 
-struct dxCCylinder : public dxGeom {
+struct dxCapsule : public dxGeom {
   dReal radius,lz;	// radius, length along z axis
-  dxCCylinder (dSpaceID space, dReal _radius, dReal _length);
+  dxCapsule (dSpaceID space, dReal _radius, dReal _length);
   void computeAABB();
 };
 
@@ -276,17 +276,17 @@
 //****************************************************************************
 // capped cylinder public API
 
-dxCCylinder::dxCCylinder (dSpaceID space, dReal _radius, dReal _length) :
+dxCapsule::dxCapsule (dSpaceID space, dReal _radius, dReal _length) :
   dxGeom (space,1)
 {
   dAASSERT (_radius > 0 && _length > 0);
-  type = dCCylinderClass;
+  type = dCapsuleClass;
   radius = _radius;
   lz = _length;
 }
 
 
-void dxCCylinder::computeAABB()
+void dxCapsule::computeAABB()
 {
   const dMatrix3& R = final_posr->R;
   const dVector3& pos = final_posr->pos;
@@ -303,37 +303,37 @@
 }
 
 
-dGeomID dCreateCCylinder (dSpaceID space, dReal radius, dReal length)
+dGeomID dCreateCapsule (dSpaceID space, dReal radius, dReal length)
 {
-  return new dxCCylinder (space,radius,length);
+  return new dxCapsule (space,radius,length);
 }
 
 
-void dGeomCCylinderSetParams (dGeomID g, dReal radius, dReal length)
+void dGeomCapsuleSetParams (dGeomID g, dReal radius, dReal length)
 {
-  dUASSERT (g && g->type == dCCylinderClass,"argument not a ccylinder");
+  dUASSERT (g && g->type == dCapsuleClass,"argument not a ccylinder");
   dAASSERT (radius > 0 && length > 0);
-  dxCCylinder *c = (dxCCylinder*) g;
+  dxCapsule *c = (dxCapsule*) g;
   c->radius = radius;
   c->lz = length;
   dGeomMoved (g);
 }
 
 
-void dGeomCCylinderGetParams (dGeomID g, dReal *radius, dReal *length)
+void dGeomCapsuleGetParams (dGeomID g, dReal *radius, dReal *length)
 {
-  dUASSERT (g && g->type == dCCylinderClass,"argument not a ccylinder");
-  dxCCylinder *c = (dxCCylinder*) g;
+  dUASSERT (g && g->type == dCapsuleClass,"argument not a ccylinder");
+  dxCapsule *c = (dxCapsule*) g;
   *radius = c->radius;
   *length = c->lz;
 }
 
 
-dReal dGeomCCylinderPointDepth (dGeomID g, dReal x, dReal y, dReal z)
+dReal dGeomCapsulePointDepth (dGeomID g, dReal x, dReal y, dReal z)
 {
-  dUASSERT (g && g->type == dCCylinderClass,"argument not a ccylinder");
+  dUASSERT (g && g->type == dCapsuleClass,"argument not a ccylinder");
   g->recomputePosr();
-  dxCCylinder *c = (dxCCylinder*) g;
+  dxCapsule *c = (dxCapsule*) g;
 
   const dReal* R = g->final_posr->R;
   const dReal* pos = g->final_posr->pos;
@@ -1377,13 +1377,13 @@
 }
 
 
-int dCollideCCylinderSphere (dxGeom *o1, dxGeom *o2, int flags,
+int dCollideCapsuleSphere (dxGeom *o1, dxGeom *o2, int flags,
 			     dContactGeom *contact, int skip)
 {
   dIASSERT (skip >= (int)sizeof(dContactGeom));
-  dIASSERT (o1->type == dCCylinderClass);
+  dIASSERT (o1->type == dCapsuleClass);
   dIASSERT (o2->type == dSphereClass);
-  dxCCylinder *ccyl = (dxCCylinder*) o1;
+  dxCapsule *ccyl = (dxCapsule*) o1;
   dxSphere *sphere = (dxSphere*) o2;
 
   contact->g1 = o1;
@@ -1407,13 +1407,13 @@
 }
 
 
-int dCollideCCylinderBox (dxGeom *o1, dxGeom *o2, int flags,
+int dCollideCapsuleBox (dxGeom *o1, dxGeom *o2, int flags,
 			  dContactGeom *contact, int skip)
 {
   dIASSERT (skip >= (int)sizeof(dContactGeom));
-  dIASSERT (o1->type == dCCylinderClass);
+  dIASSERT (o1->type == dCapsuleClass);
   dIASSERT (o2->type == dBoxClass);
-  dxCCylinder *cyl = (dxCCylinder*) o1;
+  dxCapsule *cyl = (dxCapsule*) o1;
   dxBox *box = (dxBox*) o2;
 
   contact->g1 = o1;
@@ -1444,17 +1444,17 @@
 }
 
 
-int dCollideCCylinderCCylinder (dxGeom *o1, dxGeom *o2,
+int dCollideCapsuleCapsule (dxGeom *o1, dxGeom *o2,
 				int flags, dContactGeom *contact, int skip)
 {
   int i;
   const dReal tolerance = REAL(1e-5);
 
   dIASSERT (skip >= (int)sizeof(dContactGeom));
-  dIASSERT (o1->type == dCCylinderClass);
-  dIASSERT (o2->type == dCCylinderClass);
-  dxCCylinder *cyl1 = (dxCCylinder*) o1;
-  dxCCylinder *cyl2 = (dxCCylinder*) o2;
+  dIASSERT (o1->type == dCapsuleClass);
+  dIASSERT (o2->type == dCapsuleClass);
+  dxCapsule *cyl1 = (dxCapsule*) o1;
+  dxCapsule *cyl2 = (dxCapsule*) o2;
 
   contact->g1 = o1;
   contact->g2 = o2;
@@ -1556,13 +1556,13 @@
 }
 
 
-int dCollideCCylinderPlane (dxGeom *o1, dxGeom *o2, int flags,
+int dCollideCapsulePlane (dxGeom *o1, dxGeom *o2, int flags,
 			    dContactGeom *contact, int skip)
 {
   dIASSERT (skip >= (int)sizeof(dContactGeom));
-  dIASSERT (o1->type == dCCylinderClass);
+  dIASSERT (o1->type == dCapsuleClass);
   dIASSERT (o2->type == dPlaneClass);
-  dxCCylinder *ccyl = (dxCCylinder*) o1;
+  dxCapsule *ccyl = (dxCapsule*) o1;
   dxPlane *plane = (dxPlane*) o2;
 
   // collide the deepest capping sphere with the plane
@@ -1763,14 +1763,14 @@
 }
 
 
-int dCollideRayCCylinder (dxGeom *o1, dxGeom *o2,
+int dCollideRayCapsule (dxGeom *o1, dxGeom *o2,
 			  int flags, dContactGeom *contact, int skip)
 {
   dIASSERT (skip >= (int)sizeof(dContactGeom));
   dIASSERT (o1->type == dRayClass);
-  dIASSERT (o2->type == dCCylinderClass);
+  dIASSERT (o2->type == dCapsuleClass);
   dxRay *ray = (dxRay*) o1;
-  dxCCylinder *ccyl = (dxCCylinder*) o2;
+  dxCapsule *ccyl = (dxCapsule*) o2;
 
   contact->g1 = ray;
   contact->g2 = ccyl;

Modified: branches/new_build/ode/src/collision_std.h
===================================================================
--- branches/new_build/ode/src/collision_std.h	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/collision_std.h	2006-03-20 17:48:40 UTC (rev 864)
@@ -47,19 +47,19 @@
 		    dContactGeom *contact, int skip);
 int dCollideBoxPlane (dxGeom *o1, dxGeom *o2,
 		      int flags, dContactGeom *contact, int skip);
-int dCollideCCylinderSphere (dxGeom *o1, dxGeom *o2, int flags,
+int dCollideCapsuleSphere (dxGeom *o1, dxGeom *o2, int flags,
 			     dContactGeom *contact, int skip);
-int dCollideCCylinderBox (dxGeom *o1, dxGeom *o2, int flags,
+int dCollideCapsuleBox (dxGeom *o1, dxGeom *o2, int flags,
 			  dContactGeom *contact, int skip);
-int dCollideCCylinderCCylinder (dxGeom *o1, dxGeom *o2,
+int dCollideCapsuleCapsule (dxGeom *o1, dxGeom *o2,
 				int flags, dContactGeom *contact, int skip);
-int dCollideCCylinderPlane (dxGeom *o1, dxGeom *o2, int flags,
+int dCollideCapsulePlane (dxGeom *o1, dxGeom *o2, int flags,
 			    dContactGeom *contact, int skip);
 int dCollideRaySphere (dxGeom *o1, dxGeom *o2, int flags,
 		       dContactGeom *contact, int skip);
 int dCollideRayBox (dxGeom *o1, dxGeom *o2, int flags,
 		    dContactGeom *contact, int skip);
-int dCollideRayCCylinder (dxGeom *o1, dxGeom *o2,
+int dCollideRayCapsule (dxGeom *o1, dxGeom *o2,
 			  int flags, dContactGeom *contact, int skip);
 int dCollideRayPlane (dxGeom *o1, dxGeom *o2, int flags,
 		      dContactGeom *contact, int skip);

Modified: branches/new_build/ode/src/collision_trimesh.cpp
===================================================================
--- branches/new_build/ode/src/collision_trimesh.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/collision_trimesh.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -464,7 +464,7 @@
 
 SphereCache dxTriMesh::defaultSphereCache;
 OBBCache dxTriMesh::defaultBoxCache;
-LSSCache dxTriMesh::defaultCCylinderCache;
+LSSCache dxTriMesh::defaultCapsuleCache;
 
 CollisionFaces dxTriMesh::Faces;
 
@@ -497,7 +497,7 @@
 	   win by default on spheres/boxes. */
 	this->doSphereTC = false;
 	this->doBoxTC = false;
-	this->doCCylinderTC = false;
+	this->doCapsuleTC = false;
 
     const char* msg;
     if ((msg =_AABBTreeCollider.ValidateSettings()))
@@ -526,11 +526,11 @@
         BoxTCCache[i].~BoxTC();
     }
     BoxTCCache.setSize(0);
-	n = CCylinderTCCache.size();
+	n = CapsuleTCCache.size();
 	for( i = 0; i < n; ++i ) {
-	  CCylinderTCCache[i].~CCylinderTC();
+	  CapsuleTCCache[i].~CapsuleTC();
 	}
-	CCylinderTCCache.setSize(0);
+	CapsuleTCCache.setSize(0);
 }
 
 
@@ -648,8 +648,8 @@
 		case dBoxClass:
 			((dxTriMesh*)g)->doBoxTC = (1 == enable);
 			break;
-		case dCCylinderClass:
-			((dxTriMesh*)g)->doCCylinderTC = (1 == enable);
+		case dCapsuleClass:
+			((dxTriMesh*)g)->doCapsuleTC = (1 == enable);
 			break;
 	}
 }
@@ -668,8 +668,8 @@
 			if (((dxTriMesh*)g)->doBoxTC)
 				return 1;
 			break;
-		case dCCylinderClass:
-			if (((dxTriMesh*)g)->doCCylinderTC)
+		case dCapsuleClass:
+			if (((dxTriMesh*)g)->doCapsuleTC)
 				return 1;
 			break;
 	}

Modified: branches/new_build/ode/src/collision_trimesh_ccylinder.cpp
===================================================================
--- branches/new_build/ode/src/collision_trimesh_ccylinder.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/collision_trimesh_ccylinder.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -21,7 +21,7 @@
 *************************************************************************/
 
 /*
- *	Triangle-CCylinder(Capsule) collider by Alen Ladavac
+ *	Triangle-Capsule(Capsule) collider by Alen Ladavac
  *  Ported to ODE by Nguyen Binh
  */
 
@@ -30,7 +30,7 @@
 //       There is a problem when you use original Step and set contact friction
 //		surface.mu = dInfinity;
 //		More description : 
-//			When I dropped CCylinder over the bunny ears, it seems to stuck
+//			When I dropped Capsule over the bunny ears, it seems to stuck
 //			there for a while. I think the cause is when you set surface.mu = dInfinity;
 //			the friction force is too high so it just hang the capsule there.
 //			So the good cure for this is to set mu = around 1.5 (in my case)
@@ -741,7 +741,7 @@
 }
 
 // test one mesh triangle on intersection with capsule
-static void _cldTestOneTriangleVSCCylinder( const dVector3 &v0, 
+static void _cldTestOneTriangleVSCapsule( const dVector3 &v0, 
 											const dVector3 &v1, 
 											const dVector3 &v2,
 											uint8 flags)
@@ -930,8 +930,8 @@
 	vCapsuleAxis[1] = mCapsuleRotation[1*4 + nCAPSULE_AXIS];
 	vCapsuleAxis[2] = mCapsuleRotation[2*4 + nCAPSULE_AXIS];
 
-	// Get size of CCylinder
-	dGeomCCylinderGetParams(gCylinder,&vCapsuleRadius,&fCapsuleSize);
+	// Get size of Capsule
+	dGeomCapsuleGetParams(gCylinder,&vCapsuleRadius,&fCapsuleSize);
 	fCapsuleSize += 2*vCapsuleRadius;
 
 	const dMatrix3* pTriRot = (const dMatrix3*)dGeomGetRotation(TriMesh);
@@ -980,10 +980,10 @@
 	 obbRot[1][2] = (float) mCapsuleRotation[9];
 	 obbRot[2][2] = (float) mCapsuleRotation[10];
 
-	 OBB obbCCylinder(cCenter,cExtents,obbRot);
+	 OBB obbCapsule(cCenter,cExtents,obbRot);
 
-	 Matrix4x4 CCylinderMatrix;
-	 MakeMatrix(vCapsulePosition, mCapsuleRotation, CCylinderMatrix);
+	 Matrix4x4 CapsuleMatrix;
+	 MakeMatrix(vCapsulePosition, mCapsuleRotation, CapsuleMatrix);
 
 	 Matrix4x4 MeshMatrix;
 	 MakeMatrix(mTriMeshPos, mTriMeshRot, MeshMatrix);
@@ -1007,11 +1007,11 @@
 
 		 // Intersect
 		 Collider.SetTemporalCoherence(true);
-		 Collider.Collide(*BoxTC, obbCCylinder, TriMesh->Data->BVTree, null, &MeshMatrix);
+		 Collider.Collide(*BoxTC, obbCapsule, TriMesh->Data->BVTree, null, &MeshMatrix);
 	 }
 	 else {
 		 Collider.SetTemporalCoherence(false);
-		 Collider.Collide(dxTriMesh::defaultBoxCache, obbCCylinder, TriMesh->Data->BVTree, null,&MeshMatrix);
+		 Collider.Collide(dxTriMesh::defaultBoxCache, obbCapsule, TriMesh->Data->BVTree, null,&MeshMatrix);
 	 }
 	 
 	 if (! Collider.GetContactStatus()) {
@@ -1053,7 +1053,7 @@
 			uint8 flags = UseFlags ? UseFlags[Triint] : dxTriMeshData::kUseAll;
 
 			// test this triangle
-			_cldTestOneTriangleVSCCylinder(dv[0],dv[1],dv[2], flags);
+			_cldTestOneTriangleVSCapsule(dv[0],dv[1],dv[2], flags);
 			
 		}
 	 }

Modified: branches/new_build/ode/src/collision_trimesh_internal.h
===================================================================
--- branches/new_build/ode/src/collision_trimesh_internal.h	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/collision_trimesh_internal.h	2006-03-20 17:48:40 UTC (rev 864)
@@ -125,15 +125,15 @@
 	dArray<BoxTC> BoxTCCache;
 	static OBBCache defaultBoxCache;
 	
-	struct CCylinderTC : public LSSCache{
+	struct CapsuleTC : public LSSCache{
 		dxGeom* Geom;
 	};
-	dArray<CCylinderTC> CCylinderTCCache;
-	static LSSCache defaultCCylinderCache;
+	dArray<CapsuleTC> CapsuleTCCache;
+	static LSSCache defaultCapsuleCache;
 
 	bool doSphereTC;
 	bool doBoxTC;
-	bool doCCylinderTC;
+	bool doCapsuleTC;
 
 	// Functions
 	dxTriMesh(dSpaceID Space, dTriMeshDataID Data);

Modified: branches/new_build/ode/src/export-dif.cpp
===================================================================
--- branches/new_build/ode/src/export-dif.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/export-dif.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -339,10 +339,10 @@
 
 
 
-static void printCCylinder (PrintingContext &c, dxGeom *g)
+static void printCapsule (PrintingContext &c, dxGeom *g)
 {
 	dReal radius,length;
-	dGeomCCylinderGetParams (g,&radius,&length);
+	dGeomCapsuleGetParams (g,&radius,&length);
 	c.print ("type","capsule");
 	c.print ("radius",radius);
 	c.print ("length",length);
@@ -415,7 +415,7 @@
 	switch (g->type) {
 		case dSphereClass: printSphere (c,g); break;
 		case dBoxClass: printBox (c,g); break;
-		case dCCylinderClass: printCCylinder (c,g); break;
+		case dCapsuleClass: printCapsule (c,g); break;
 		case dPlaneClass: printPlane (c,g); break;
 		case dRayClass: printRay (c,g); break;
 		case dGeomTransformClass: printGeomTransform (c,g); break;

Modified: branches/new_build/ode/src/mass.cpp
===================================================================
--- branches/new_build/ode/src/mass.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/src/mass.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -128,8 +128,8 @@
 }
 
 
-void dMassSetCappedCylinder (dMass *m, dReal density, int direction,
-			     dReal radius, dReal length)
+void dMassSetCapsule (dMass *m, dReal density, int direction,
+		      dReal radius, dReal length)
 {
   dReal M1,M2,Ia,Ib;
   dAASSERT (m);
@@ -152,10 +152,10 @@
 }
 
 
-void dMassSetCappedCylinderTotal (dMass *m, dReal total_mass, int direction,
-			     dReal a, dReal b)
+void dMassSetCapsuleTotal (dMass *m, dReal total_mass, int direction,
+			   dReal a, dReal b)
 {
-  dMassSetCappedCylinder (m, 1.0, direction, a, b);
+  dMassSetCapsule (m, 1.0, direction, a, b);
   dMassAdjust (m, total_mass);
 }
 

Modified: branches/new_build/ode/test/test_I.cpp
===================================================================
--- branches/new_build/ode/test/test_I.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_I.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -50,7 +50,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_boxstack.cpp
===================================================================
--- branches/new_build/ode/test/test_boxstack.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_boxstack.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -33,7 +33,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 
@@ -42,7 +42,7 @@
 #define NUM 100			// max number of objects
 #define DENSITY (5.0)		// density of all objects
 #define GPB 3			// maximum number of geometries per body
-#define MAX_CONTACTS 4		// maximum number of contact points per body
+#define MAX_CONTACTS 8		// maximum number of contact points per body
 
 
 // dynamics and collision objects
@@ -188,13 +188,13 @@
     }
     else if (cmd == 'c') {
       sides[0] *= 0.5;
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
-      obj[i].geom[0] = dCreateCCylinder (space,sides[0],sides[1]);
+      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
+      obj[i].geom[0] = dCreateCapsule (space,sides[0],sides[1]);
     }
 #ifdef dCYLINDER_ENABLED
     // cylinder option not yet implemented
     else if (cmd == 'y') {
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
+      dMassSetCylinder (&m,DENSITY,3,sides[0],sides[1]);
       obj[i].geom[0] = dCreateCylinder (space,sides[0],sides[1]);
     }
 #endif
@@ -231,8 +231,8 @@
 	else {
 	  dReal radius = dRandReal()*0.1+0.05;
 	  dReal length = dRandReal()*1.0+0.1;
-	  g2[k] = dCreateCCylinder (0,radius,length);
-	  dMassSetCappedCylinder (&m2,DENSITY,3,radius,length);
+	  g2[k] = dCreateCapsule (0,radius,length);
+	  dMassSetCapsule (&m2,DENSITY,3,radius,length);
 	}
 	dGeomTransformSetGeom (obj[i].geom[k],g2[k]);
 
@@ -311,10 +311,10 @@
   else if (type == dSphereClass) {
     dsDrawSphere (pos,R,dGeomSphereGetRadius (g));
   }
-  else if (type == dCCylinderClass) {
+  else if (type == dCapsuleClass) {
     dReal radius,length;
-    dGeomCCylinderGetParams (g,&radius,&length);
-    dsDrawCappedCylinder (pos,R,length,radius);
+    dGeomCapsuleGetParams (g,&radius,&length);
+    dsDrawCapsule (pos,R,length,radius);
   }
 #ifdef dCYLINDER_ENABLED
   // cylinder option not yet implemented

Modified: branches/new_build/ode/test/test_buggy.cpp
===================================================================
--- branches/new_build/ode/test/test_buggy.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_buggy.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -41,7 +41,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_chain1.c
===================================================================
--- branches/new_build/ode/test/test_chain1.c	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_chain1.c	2006-03-20 17:48:40 UTC (rev 864)
@@ -36,7 +36,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_chain2.cpp
===================================================================
--- branches/new_build/ode/test/test_chain2.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_chain2.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -35,7 +35,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_collision.cpp
===================================================================
--- branches/new_build/ode/test/test_collision.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_collision.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -43,7 +43,7 @@
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawBox dsDrawBoxD
 #define dsDrawLine dsDrawLineD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 //****************************************************************************
@@ -182,11 +182,11 @@
       break;
     }
 
-    case dCCylinderClass: {
+    case dCapsuleClass: {
       dsSetColorAlpha (0,1,0,0.8);
       dReal radius,length;
-      dGeomCCylinderGetParams (g,&radius,&length);
-      dsDrawCappedCylinder (pos,dGeomGetRotation(g),length,radius);
+      dGeomCapsuleGetParams (g,&radius,&length);
+      dsDrawCapsule (pos,dGeomGetRotation(g),length,radius);
       break;
     }
 
@@ -337,14 +337,14 @@
   dReal r,l,beta,x,y,d;
 
   dSimpleSpace space(0);
-  dGeomID ccyl = dCreateCCylinder (0,1,1);
+  dGeomID ccyl = dCreateCapsule (0,1,1);
   dSpaceAdd (space,ccyl);
 
   // ********** make a random ccyl
 
   r = dRandReal()*0.5 + 0.01;
   l = dRandReal()*1 + 0.01;
-  dGeomCCylinderSetParams (ccyl,r,l);
+  dGeomCapsuleSetParams (ccyl,r,l);
   dMakeRandomVector (p,3,1.0);
   dGeomSetPosition (ccyl,p[0],p[1],p[2]);
   dRFromAxisAndAngle (R,dRandReal()*2-1,dRandReal()*2-1,
@@ -355,7 +355,7 @@
 
   beta = dRandReal()-0.5;
   for (j=0; j<3; j++) a[j] = p[j] + l*beta*R[j*4+2];
-  if (dFabs(dGeomCCylinderPointDepth (ccyl,a[0],a[1],a[2]) - r) >= tol)
+  if (dFabs(dGeomCapsulePointDepth (ccyl,a[0],a[1],a[2]) - r) >= tol)
     FAILED();
 
   // ********** test point on surface (excluding caps) has depth 0
@@ -365,7 +365,7 @@
   y = r*cos(beta);
   beta = dRandReal()-0.5;
   for (j=0; j<3; j++) a[j] = p[j] + x*R[j*4+0] + y*R[j*4+1] + l*beta*R[j*4+2];
-  if (dFabs(dGeomCCylinderPointDepth (ccyl,a[0],a[1],a[2])) >= tol) FAILED();
+  if (dFabs(dGeomCapsulePointDepth (ccyl,a[0],a[1],a[2])) >= tol) FAILED();
 
   // ********** test point on surface of caps has depth 0
 
@@ -377,7 +377,7 @@
   else {
     for (j=0; j<3; j++) a[j] = p[j] + a[j]*r - l*0.5*R[j*4+2];
   }
-  if (dFabs(dGeomCCylinderPointDepth (ccyl,a[0],a[1],a[2])) >= tol) FAILED();
+  if (dFabs(dGeomCapsulePointDepth (ccyl,a[0],a[1],a[2])) >= tol) FAILED();
 
   // ********** test point inside ccyl has positive depth
 
@@ -385,7 +385,7 @@
   dNormalize3 (a);
   beta = dRandReal()-0.5;
   for (j=0; j<3; j++) a[j] = p[j] + a[j]*r*0.99 + l*beta*R[j*4+2];
-  if (dGeomCCylinderPointDepth (ccyl,a[0],a[1],a[2]) < 0) FAILED();
+  if (dGeomCapsulePointDepth (ccyl,a[0],a[1],a[2]) < 0) FAILED();
 
   // ********** test point depth (1)
 
@@ -395,7 +395,7 @@
   y = (r-d)*cos(beta);
   beta = dRandReal()-0.5;
   for (j=0; j<3; j++) a[j] = p[j] + x*R[j*4+0] + y*R[j*4+1] + l*beta*R[j*4+2];
-  if (dFabs(dGeomCCylinderPointDepth (ccyl,a[0],a[1],a[2]) - d) >= tol)
+  if (dFabs(dGeomCapsulePointDepth (ccyl,a[0],a[1],a[2]) - d) >= tol)
     FAILED();
 
   // ********** test point depth (2)
@@ -409,7 +409,7 @@
   else {
     for (j=0; j<3; j++) a[j] = p[j] + a[j]*(r-d) - l*0.5*R[j*4+2];
   }
-  if (dFabs(dGeomCCylinderPointDepth (ccyl,a[0],a[1],a[2]) - d) >= tol)
+  if (dFabs(dGeomCapsulePointDepth (ccyl,a[0],a[1],a[2]) - d) >= tol)
     FAILED();
 
   PASSED();
@@ -747,7 +747,7 @@
 
   dSimpleSpace space(0);
   dGeomID ray = dCreateRay (0,0);
-  dGeomID ccyl = dCreateCCylinder (0,1,1);
+  dGeomID ccyl = dCreateCapsule (0,1,1);
   dSpaceAdd (space,ray);
   dSpaceAdd (space,ccyl);
 
@@ -755,7 +755,7 @@
 
   r = dRandReal()*0.5 + 0.01;
   l = dRandReal()*1 + 0.01;
-  dGeomCCylinderSetParams (ccyl,r,l);
+  dGeomCapsuleSetParams (ccyl,r,l);
   dMakeRandomVector (p,3,1.0);
   dGeomSetPosition (ccyl,p[0],p[1],p[2]);
   dRFromAxisAndAngle (R,dRandReal()*2-1,dRandReal()*2-1,
@@ -795,7 +795,7 @@
   dGeomRaySetLength (ray,r*1.01);
   if (dCollide (ray,ccyl,0,&contact,sizeof(dContactGeom)) != 1) FAILED();
   // check depth of contact point
-  if (dFabs (dGeomCCylinderPointDepth
+  if (dFabs (dGeomCapsulePointDepth
 	     (ccyl,contact.pos[0],contact.pos[1],contact.pos[2])) > tol)
     FAILED();
 
@@ -818,7 +818,7 @@
   dGeomRaySetLength (ray,r*1.01);
   if (dCollide (ray,ccyl,0,&contact,sizeof(dContactGeom)) != 1) FAILED();
   // check depth of contact point
-  if (dFabs (dGeomCCylinderPointDepth
+  if (dFabs (dGeomCapsulePointDepth
 	     (ccyl,contact.pos[0],contact.pos[1],contact.pos[2])) > tol)
     FAILED();
 
@@ -832,7 +832,7 @@
 
   if (dCollide (ray,ccyl,0,&contact,sizeof(dContactGeom))) {
     // check depth of contact point
-    if (dFabs (dGeomCCylinderPointDepth
+    if (dFabs (dGeomCapsulePointDepth
 	       (ccyl,contact.pos[0],contact.pos[1],contact.pos[2])) > tol)
       FAILED();
 
@@ -1287,7 +1287,7 @@
     fn.path_to_textures = "../../drawstuff/textures";
 
     dsSetSphereQuality (3);
-    dsSetCappedCylinderQuality (8);
+    dsSetCapsuleQuality (8);
     dsSimulationLoop (argc,argv,1280,900,&fn);
   }
   else {

Modified: branches/new_build/ode/test/test_crash.cpp
===================================================================
--- branches/new_build/ode/test/test_crash.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_crash.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -36,7 +36,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_friction.cpp
===================================================================
--- branches/new_build/ode/test/test_friction.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_friction.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -57,7 +57,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_moving_trimesh.cpp
===================================================================
--- branches/new_build/ode/test/test_moving_trimesh.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_moving_trimesh.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -33,7 +33,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #define dsDrawLine dsDrawLineD
 #define dsDrawTriangle dsDrawTriangleD
 #endif
@@ -1558,14 +1558,14 @@
     }
     else if (cmd == 'c') {
       sides[0] *= 0.5;
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
-      obj[i].geom[0] = dCreateCCylinder (space,sides[0],sides[1]);
+      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
+      obj[i].geom[0] = dCreateCapsule (space,sides[0],sides[1]);
     }
 /*
     // cylinder option not yet implemented
     else if (cmd == 'l') {
       sides[1] *= 0.5;
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
+      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
       obj[i].geom[0] = dCreateCylinder (space,sides[0],sides[1]);
     }
 */
@@ -1613,8 +1613,8 @@
 	else {
 	  dReal radius = dRandReal()*0.1+0.05;
 	  dReal length = dRandReal()*1.0+0.1;
-	  g2[k] = dCreateCCylinder (0,radius,length);
-	  dMassSetCappedCylinder (&m2,DENSITY,3,radius,length);
+	  g2[k] = dCreateCapsule (0,radius,length);
+	  dMassSetCapsule (&m2,DENSITY,3,radius,length);
 	}
 	dGeomTransformSetGeom (obj[i].geom[k],g2[k]);
 
@@ -1688,10 +1688,10 @@
   else if (type == dSphereClass) {
     dsDrawSphere (pos,R,dGeomSphereGetRadius (g));
   }
-  else if (type == dCCylinderClass) {
+  else if (type == dCapsuleClass) {
     dReal radius,length;
-    dGeomCCylinderGetParams (g,&radius,&length);
-    dsDrawCappedCylinder (pos,R,length,radius);
+    dGeomCapsuleGetParams (g,&radius,&length);
+    dsDrawCapsule (pos,R,length,radius);
   }
 /*
   // cylinder option not yet implemented

Modified: branches/new_build/ode/test/test_ode.cpp
===================================================================
--- branches/new_build/ode/test/test_ode.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_ode.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -663,7 +663,7 @@
     printf ("\tpassed (4)\n"); else printf ("\tFAILED (4)\n");
 
   dMassSetZero (&m);
-  dMassSetCappedCylinder (&m,1.3,1,0.76,1.53);
+  dMassSetCapsule (&m,1.3,1,0.76,1.53);
   if (cmp(m.mass,5.99961928996029) && m.c[0]==0 && m.c[1]==0 && m.c[2]==0 &&
       cmp(m._I(0,0),1.59461986077384) &&
       cmp(m._I(1,1),4.57537403079093) &&

Modified: branches/new_build/ode/test/test_space.cpp
===================================================================
--- branches/new_build/ode/test/test_space.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_space.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -46,7 +46,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_space_stress.cpp
===================================================================
--- branches/new_build/ode/test/test_space_stress.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_space_stress.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -33,7 +33,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 
@@ -187,14 +187,14 @@
     }
     else if (cmd == 'c') {
       sides[0] *= 0.5;
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
-      obj[i].geom[0] = dCreateCCylinder (space,sides[0],sides[1]);
+      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
+      obj[i].geom[0] = dCreateCapsule (space,sides[0],sides[1]);
     }
 /*
     // cylinder option not yet implemented
     else if (cmd == 'l') {
       sides[1] *= 0.5;
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
+      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
       obj[i].geom[0] = dCreateCylinder (space,sides[0],sides[1]);
     }
 */
@@ -231,8 +231,8 @@
 	else {
 	  dReal radius = dRandReal()*0.1+0.05;
 	  dReal length = dRandReal()*1.0+0.1;
-	  g2[k] = dCreateCCylinder (0,radius,length);
-	  dMassSetCappedCylinder (&m2,DENSITY,3,radius,length);
+	  g2[k] = dCreateCapsule (0,radius,length);
+	  dMassSetCapsule (&m2,DENSITY,3,radius,length);
 	}
 	dGeomTransformSetGeom (obj[i].geom[k],g2[k]);
 
@@ -313,10 +313,10 @@
   else if (type == dSphereClass) {
     dsDrawSphere (pos,R,dGeomSphereGetRadius (g));
   }
-  else if (type == dCCylinderClass) {
+  else if (type == dCapsuleClass) {
     dReal radius,length;
-    dGeomCCylinderGetParams (g,&radius,&length);
-    dsDrawCappedCylinder (pos,R,length,radius);
+    dGeomCapsuleGetParams (g,&radius,&length);
+    dsDrawCapsule (pos,R,length,radius);
   }
 /*
   // cylinder option not yet implemented

Modified: branches/new_build/ode/test/test_step.cpp
===================================================================
--- branches/new_build/ode/test/test_step.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_step.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -40,7 +40,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #endif
 
 

Modified: branches/new_build/ode/test/test_trimesh.cpp
===================================================================
--- branches/new_build/ode/test/test_trimesh.cpp	2006-03-19 11:46:09 UTC (rev 863)
+++ branches/new_build/ode/test/test_trimesh.cpp	2006-03-20 17:48:40 UTC (rev 864)
@@ -35,7 +35,7 @@
 #define dsDrawBox dsDrawBoxD
 #define dsDrawSphere dsDrawSphereD
 #define dsDrawCylinder dsDrawCylinderD
-#define dsDrawCappedCylinder dsDrawCappedCylinderD
+#define dsDrawCapsule dsDrawCapsuleD
 #define dsDrawLine dsDrawLineD
 #define dsDrawTriangle dsDrawTriangleD
 #endif
@@ -213,14 +213,14 @@
     }
     else if (cmd == 'c') {
       sides[0] *= 0.5;
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
-      obj[i].geom[0] = dCreateCCylinder (space,sides[0],sides[1]);
+      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
+      obj[i].geom[0] = dCreateCapsule (space,sides[0],sides[1]);
     }
 /*
     // cylinder option not yet implemented
     else if (cmd == 'l') {
       sides[1] *= 0.5;
-      dMassSetCappedCylinder (&m,DENSITY,3,sides[0],sides[1]);
+      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
       obj[i].geom[0] = dCreateCylinder (space,sides[0],sides[1]);
     }
 */
@@ -257,8 +257,8 @@
 	else {
 	  dReal radius = dRandReal()*0.1+0.05;
 	  dReal length = dRandReal()*1.0+0.1;
-	  g2[k] = dCreateCCylinder (0,radius,length);
-	  dMassSetCappedCylinder (&m2,DENSITY,3,radius,length);
+	  g2[k] = dCreateCapsule (0,radius,length);
+	  dMassSetCapsule (&m2,DENSITY,3,radius,length);
 	}
 	dGeomTransformSetGeom (obj[i].geom[k],g2[k]);
 
@@ -332,10 +332,10 @@
   else if (type == dSphereClass) {
     dsDrawSphere (pos,R,dGeomSphereGetRadius (g));
   }
-  else if (type == dCCylinderClass) {
+  else if (type == dCapsuleClass) {
     dReal radius,length;
-    dGeomCCylinderGetParams (g,&radius,&length);
-    dsDrawCappedCylinder (pos,R,length,radius);
+    dGeomCapsuleGetParams (g,&radius,&length);
+    dsDrawCapsule (pos,R,length,radius);
   }
 /*
   // cylinder option not yet implemented


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.