File COLLADA-linuxbuild.patch of Package openCOLLADA

Overview Repositories Revisions Requests Users Attributes Meta

File COLLADA-linuxbuild.patch of Package openCOLLADA (Revision 1657e107b7b3dcba47408e6f22784c02)

Currently displaying revision 1657e107b7b3dcba47408e6f22784c02 , Show latest

Index: COLLADABaseUtils/SConscript
===================================================================
--- COLLADABaseUtils/SConscript.orig	2010-11-22 10:12:49.000000000 +0200
+++ COLLADABaseUtils/SConscript	2010-11-22 10:12:57.000000000 +0200
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env python
 Import('env')
 
 libName = 'OpenCOLLADABaseUtils'
@@ -15,7 +15,8 @@ incDirs = ['include/', 'include/Math/',
 
 if not env['PCRENATIVE']:
     incDirs += ['../Externals/pcre/include']
-
+else:
+    incDirs += ['/usr/include']
 
 src = []
 for srcDir in srcDirs:
Index: COLLADASaxFrameworkLoader/SConscript
===================================================================
--- COLLADASaxFrameworkLoader/SConscript.orig	2010-11-22 10:12:49.000000000 +0200
+++ COLLADASaxFrameworkLoader/SConscript	2010-11-22 10:12:57.000000000 +0200
@@ -1,9 +1,9 @@
+#!/usr/bin/env python
             
 Import('env')
 
 libName = 'OpenCOLLADASaxFrameworkLoader'
 
-
 srcDirs = [ 'src/',
             'src/generated14/',
             'src/generated15/']
@@ -19,13 +19,19 @@ incDirs = [ 'include',
             '../COLLADABaseUtils/include',
             '../GeneratedSaxParser/include',
             '../COLLADAFramework/include',
-            '../Externals/LibXML/include',
             '../Externals/MathMLSolver/include',
             '../Externals/MathMLSolver/include/AST']
 
 if not env['PCRENATIVE']:
     incDirs += ['../Externals/pcre/include']
 
+if env['XMLPARSER'] == 'expatnative':
+    incDirs += ['/usr/include']
+elif env['XMLPARSER'] == 'libxmlnative':
+    incDirs += ['/usr/include/libxml2']
+else:
+    incDirs += ['../Externals/LibXML/include']
+
 src = []
 for srcDir in srcDirs:
     src += [ variantDir + str(p) for p in  Glob(srcDir + '*.cpp')]   
Index: GeneratedSaxParser/SConscript
===================================================================
--- GeneratedSaxParser/SConscript.orig	2010-11-22 10:12:49.000000000 +0200
+++ GeneratedSaxParser/SConscript	2010-11-22 10:12:57.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 
 Import('env')
 
@@ -29,6 +30,8 @@ else:
 
 if env['XMLPARSER'] == 'expat':
     incDirs += ['../Externals/expat/lib/']
+elif env['XMLPARSER'] == 'expatnative':
+    incDirs += ['/usr/include']
 elif env['XMLPARSER'] == 'libxml':
     incDirs += ['../Externals/LibXML/include/']
 elif env['XMLPARSER'] == 'libxmlnative':
Index: SConstruct
===================================================================
--- SConstruct.orig	2010-11-22 10:12:49.000000000 +0200
+++ SConstruct	2010-11-22 10:12:57.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import platform   #Requiered to detect the current plattform

Places

File COLLADA-linuxbuild.patch of Package openCOLLADA (Revision 1657e107b7b3dcba47408e6f22784c02)

Places