Changeset 1209 for branches

Timestamp:

05/08/08 10:57:16 (4 months ago)

Author:

patrick

Message:

Fixed linker errors with the Collada loader on Windows.

Files:

• branches/fcptr_stable_jun07/SConstruct (modified) (1 diff)
• branches/fcptr_stable_jun07/Source/System/FileIO/Collada/build.info (modified) (2 diffs)

branches/fcptr_stable_jun07/SConstruct

@@ -507 +507 @@
-    header = "NVPerfSDK.h", required = False)
-
+collada_lib_prefix = ""
+if "win32" == platform:
+    collada_lib_prefix = "lib"
-optional_libs_options["collada"] = OpenSG.ColladaOption.ColladaOption(
-    "collada", "Location of the collada dom library", library =
-collada_dae"
-collada_LIBXMLPlugin"
-collada_STLDatabase"
-collada_dom"
-collada_stdErrPlugin"
-collada_dae"
+%scollada_dae" % collada_lib_prefix
+%scollada_LIBXMLPlugin" % collada_lib_prefix
+%scollada_STLDatabase" % collada_lib_prefix
+%scollada_dom" % collada_lib_prefix
+%scollada_stdErrPlugin" % collada_lib_prefix
+%scollada_dae" % collada_lib_prefix
-    header = "dae/daeIntegrationObject.h", required = False)
-
+xml2_lib = ["xml2"]
+if "win32" == platform:
+    # Link against the static versions of libiconv and libxml2 on Windows.
+    xml2_lib = ["iconv_a", "libxml2_a"]
-optional_libs_options["xml2"] = sca_opts.StandardPackageOption(
-"xml2"
+xml2_lib
-    required = False)
-

branches/fcptr_stable_jun07/Source/System/FileIO/Collada/build.info

@@ -15 +15 @@
-        
-        libs.extend(collada_option.library)
-[xml2_option.library]
+xml2_option.library  
-
-        if collada_option.incDir:
@@ -23 +23 @@
-            libpath.append(collada_option.libDir)
-
+        if xml2_option.incDir:
+            cpppath.append(xml2_option.incDir)
+
+        if xml2_option.libDir:
+            libpath.append(xml2_option.libDir)
+