Changeset 60 for branches/scons_build_creation/CommonConf

Timestamp:

09/06/06 17:00:28 (2 years ago)

Author:

allenb

Message:

Merge from trunk: Using command: svn merge -r16:56 https://opensg.vrsource.org/svn/trunk

Files:

• branches/scons_build_creation/CommonConf/common.libs.in (modified) (2 diffs)
• branches/scons_build_creation/CommonConf/commonCOLLADA.in (copied) (copied from trunk/CommonConf/commonCOLLADA.in)
• branches/scons_build_creation/CommonConf/commonLIBXML.in (copied) (copied from trunk/CommonConf/commonLIBXML.in)

branches/scons_build_creation/CommonConf/common.libs.in

@@ -23 +23 @@
-ac_gdz_package_dirs_System="System/FieldContainer/Base@ System/FieldContainer/Mixins@ System/FieldContainer/Node@ System/FieldContainer/Attachments@ System/FieldContainer/Fields@ System/FieldContainer/Fields/Wrapper@ System/Action/Base@ System/Action/RenderAction@ System/Image@ System/Image/WS@ System/FileIO/Base@ System/FileIO/ScanParseSkel@ System/FileIO/OSG@ System/Action/IntersectAction@ System/State/Base@ System/State/Base/WS@ System/Material/Base@ System/Material/Simple@ System/NodeCores/Groups/Base@ System/NodeCores/Drawables/Base@ System/Window/Base@ System/Statistics/Base@ System/Window/FrameBufferObjects@ System/RenderingBackend@ "
-ac_gdz_package_inc_dep_System="@Base@ GL" 
-EXPAT
+
-ac_gdz_package_testinc_dep_System="GLUT WindowSystem/GLUT " 
-ac_gdz_package_testlink_dep_System="WindowGLUTLib GLUT GL TIF JPG PNG MNG" 
@@ -99 +99 @@
-
-ac_gdz_package_name_FileIO="FileIO" 
-
-
-
+Collada@ System/FileIO/
+COLLADA 
+COLLADA LIBXML 
-ac_gdz_package_testinc_dep_FileIO="GLUT WindowSystem/GLUT " 
-ac_gdz_package_testlink_dep_FileIO="WindowGLUTLib GLUT GL TIF JPG PNG MNG"