[Opal-commits] opal SConstruct,1.10,1.11 changelog.txt,1.27,1.28 gatherSrcRelease.bat,1.1,1.2 readme
Status: Inactive
Brought to you by:
tylerstreeter
Menu
▾
▴
[Opal-commits] opal SConstruct,1.10,1.11 changelog.txt,1.27,1.28 gatherSrcRelease.bat,1.1,1.2 readme.txt,1.40,1.41 todo.txt,1.80,1.81 win32BinaryReadme.txt,1.2,1.3
|
From: tylerstreeter <tyl...@us...> - 2005-06-24 17:50:59
|
Update of /cvsroot/opal/opal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27529 Modified Files: SConstruct changelog.txt gatherSrcRelease.bat readme.txt todo.txt win32BinaryReadme.txt Log Message: Put TinyXml source in with the OPAL source to make it easier to build for everyone. Index: todo.txt =================================================================== RCS file: /cvsroot/opal/opal/todo.txt,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** todo.txt 24 Jun 2005 16:40:48 -0000 1.80 --- todo.txt 24 Jun 2005 17:50:47 -0000 1.81 *************** *** 2,7 **** ================= - * put TinyXML in with the OPAL source to make it easier to build; remove conditional compilation options from sconstruct and win32 source - * from EarthquakeProof in the forum: "I've noticed another thing too, when two Solids which are static collide, there is an error. So I've modified a little ODESimulator.cpp to solve that (the problem is a call to dGeomIsBodyEnabled when the body is 0 which is the case with static Solids. " --- 2,5 ---- Index: gatherSrcRelease.bat =================================================================== RCS file: /cvsroot/opal/opal/gatherSrcRelease.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gatherSrcRelease.bat 18 Apr 2005 22:21:00 -0000 1.1 --- gatherSrcRelease.bat 24 Jun 2005 17:50:47 -0000 1.2 *************** *** 15,18 **** --- 15,23 ---- copy ..\src\ODE\*.h src\ODE copy ..\src\ODE\*.cpp src\ODE + mkdir src\external + mkdir src\external\tinyxml + copy ..\src\external\tinyxml\SConscript src\external\tinyxml + copy ..\src\external\tinyxml\*.h src\external\tinyxml + copy ..\src\external\tinyxml\*.cpp src\external\tinyxml mkdir vc71 *************** *** 27,33 **** copy ..\tools\blender\*.py tools\blender copy ..\tools\blender\*.txt tools\blender - mkdir tools\tinyxml - copy ..\tools\tinyxml\SConstruct tools\tinyxml - copy ..\tools\tinyxml\*.txt tools\tinyxml mkdir samples --- 32,35 ---- Index: win32BinaryReadme.txt =================================================================== RCS file: /cvsroot/opal/opal/win32BinaryReadme.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** win32BinaryReadme.txt 21 Apr 2005 17:04:50 -0000 1.2 --- win32BinaryReadme.txt 24 Jun 2005 17:50:47 -0000 1.3 *************** *** 16,20 **** * The OPAL libraries have been built with the following options: ! XML=true MESH=true --- 16,20 ---- * The OPAL libraries have been built with the following options: ! double=false MESH=true *************** *** 22,26 **** Dependencies: ------------------------------------ ! 1. TinyXML: headers are required because the OPAL libraries in this package are built with the XML option; if you don't want this, you can rebuild the OPAL libraries without the XML option. --- 22,26 ---- Dependencies: ------------------------------------ ! None. Index: SConstruct =================================================================== RCS file: /cvsroot/opal/opal/SConstruct,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SConstruct 24 Jun 2005 16:40:47 -0000 1.10 --- SConstruct 24 Jun 2005 17:50:47 -0000 1.11 *************** *** 1,5 **** import os ! def printOptions(debugMode, engine, XML): print 'Building OPAL with the following options: ' if debugMode == True: --- 1,5 ---- import os ! def printOptions(debugMode, engine, useDouble): print 'Building OPAL with the following options: ' if debugMode == True: *************** *** 8,15 **** print 'mode = release' print 'engine = ' + engine ! if XML == True: ! print 'Use XML functions = true' else: ! print 'Use XML functions = false' def setupBaseEnvironment(): --- 8,15 ---- print 'mode = release' print 'engine = ' + engine ! if useDouble == True: ! print 'Use double precision = true' else: ! print 'Use double precision = false' def setupBaseEnvironment(): *************** *** 72,78 **** opts.AddOptions( BoolOption('debug', 'Build in debug mode', False), - BoolOption('XML', 'Build with XML saving/loading functions (TinyXML headers required)', True), BoolOption('mesh', 'Build with Mesh Shape functionality', True), ! BoolOption('double', 'Build with OPAL's reals set to double instead of float', False), PathOption('extra_include_path', 'Additional include directory', '.'), PathOption('extra_lib_path', 'Additional lib directory', '.')) --- 72,77 ---- opts.AddOptions( BoolOption('debug', 'Build in debug mode', False), BoolOption('mesh', 'Build with Mesh Shape functionality', True), ! BoolOption('double', 'Build with reals set to double instead of float', False), PathOption('extra_include_path', 'Additional include directory', '.'), PathOption('extra_lib_path', 'Additional lib directory', '.')) *************** *** 105,112 **** buildDir = 'build/' + env['PLATFORM'] + '/release' - # Add XML support if desired. - if env['XML'] == True: - env.Append(CPPDEFINES = ['OPAL_USE_XML']) - # Add mesh support if desired. if env['mesh'] == True: --- 104,107 ---- *************** *** 118,122 **** if len(COMMAND_LINE_TARGETS) != 0: ! printOptions(env['debug'], physicsEngine, env['XML']) #else: # printTargetsMessage() --- 113,117 ---- if len(COMMAND_LINE_TARGETS) != 0: ! printOptions(env['debug'], physicsEngine, env['double']) #else: # printTargetsMessage() *************** *** 124,130 **** # Generate command line help text env.Help(opts.GenerateHelpText(env) + ! '\nSpecify one of the following targets: ' + '\n-> ODE: build with ODE support' + '\n-> install: install libraries and header files to <prefix>' + '\n') --- 119,128 ---- # Generate command line help text env.Help(opts.GenerateHelpText(env) + ! '\nSpecify one or more of the following targets (Note: a physics engine target is required): ' + '\n-> ODE: build with ODE support' + '\n-> install: install libraries and header files to <prefix>' + + '\nExample 1 (build debug library with ODE support): scons ODE debug=true' + + '\nExample 2 (build with ODE support and install): scons ODE install prefix=/path/to/install/dir' + + '\nExample 3 (build with ODE support and specify header/lib paths): scons ODE extra_include_path=/path/to/includes extra_lib_path=/path/to/libs' + '\n') *************** *** 135,140 **** objects = SConscript(dirs = ['src'], build_dir = buildDir, duplicate = 0) ! # Add in XML-related objects (does nothing if XML is not used) ! #objects += SConscript(dirs = ['external/src/tinyxml'], build_dir = buildDir + '/tinyxml', duplicate = 0) opalLib = '' --- 133,138 ---- objects = SConscript(dirs = ['src'], build_dir = buildDir, duplicate = 0) ! # Add in XML-related objects ! objects += SConscript(dirs = ['src/external/tinyxml'], build_dir = buildDir + '/external/tinyxml', duplicate = 0) opalLib = '' Index: changelog.txt =================================================================== RCS file: /cvsroot/opal/opal/changelog.txt,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** changelog.txt 24 Jun 2005 16:40:48 -0000 1.27 --- changelog.txt 24 Jun 2005 17:50:47 -0000 1.28 *************** *** 15,19 **** ------------------------------------------ ! * 6-24-05: Added a compile-time flag OPAL_USE_DOUBLE which determines whether OPAL's reals are floats or doubles. Also added a run-time check when a physics engine-specific Simulator (e.g. ODESimulator) is created to make sure OPAL's reals are the same size as the physics engine's reals. * 6-19-05: Added Spaces tutorial to website. (Tyler Streeter) --- 15,21 ---- ------------------------------------------ ! * 6-24-05: Put TinyXml source in with the OPAL source to make it easier to build for everyone. (Tyler Streeter) ! ! * 6-24-05: Added a compile-time flag OPAL_USE_DOUBLE which determines whether OPAL's reals are floats or doubles. Also added a run-time check when a physics engine-specific Simulator (e.g. ODESimulator) is created to make sure OPAL's reals are the same size as the physics engine's reals. (Tyler Streeter) * 6-19-05: Added Spaces tutorial to website. (Tyler Streeter) Index: readme.txt =================================================================== RCS file: /cvsroot/opal/opal/readme.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** readme.txt 2 May 2005 16:40:58 -0000 1.40 --- readme.txt 24 Jun 2005 17:50:47 -0000 1.41 *************** *** 8,12 **** ------------------------------------ samples - directory containing example applications that show how to use OPAL ! src - directory containing the OPAL source code (including base OPAL functions and support for various physics engines) tools - miscellaneous utilities (e.g. exporter scripts for 3rd-party content generation software) vc71 - Visual Studio .NET 2003 project files --- 8,12 ---- ------------------------------------ samples - directory containing example applications that show how to use OPAL ! src - directory containing the OPAL source code (base OPAL code and support for specific physics engines) tools - miscellaneous utilities (e.g. exporter scripts for 3rd-party content generation software) vc71 - Visual Studio .NET 2003 project files *************** *** 23,29 **** 1. A physics engine: at least one physics engine must be installed; see the OPAL website for a list of supported physics engines 2. SCons (and Python): Scons is required unless you want to use the Visual Studio projects; Scons requires Python - 3. TinyXML (optional): headers and static library are required for OPAL's XML functions (a tinyxml SConstruct is provided in the 'tools' directory) - - * Warning: When using ODE, make sure ODE's dReals and OPAL's reals are set to the same floating point precision. OPAL's reals are typedef'd to 'float' by default. If you would rather use doubles, change OPAL's real typedef to double. --- 23,26 ---- *************** *** 37,43 **** scons ODE ! This should generate opal-ode.so or opal-ode.dll, depending on the platform. Note that it builds the optimized version by default. To build the debug version without XML support, type: ! scons ODE debug=true XML=false You can specify additional include and library paths like this: --- 34,41 ---- scons ODE ! This should generate opal-ode.so or opal-ode.dll, depending on the platform. Note that it builds the optimized version by default. ! To build the debug version with double precision reals (instead of the default, which uses floats), type: ! scons ODE debug=true double=true You can specify additional include and library paths like this: |
