[Python-ogre-commit] SF.net SVN: python-ogre: [497] trunk/python-ogre

[<and...@us...>]

Revision: 497
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=497&view=rev
Author:   andy_miller
Date:     2007-12-08 17:08:24 -0800 (Sat, 08 Dec 2007)

Log Message:
-----------
Finally fixed the RPATH and Origin..  Small change to Ogreal 

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/SConstruct
    trunk/python-ogre/code_generators/ogreal/generate_code.py

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-08 00:16:24 UTC (rev 496)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-09 01:08:24 UTC (rev 497)
@@ -18,7 +18,7 @@
 LIB_Boost = 'libboost_python-gcc41-1_34'
 
 # in Linux we need to code in the Relative path for the library
-RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') 
+RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\'' 
 
 # We need to know where to find gccxml......
 gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin')

Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct	2007-12-08 00:16:24 UTC (rev 496)
+++ trunk/python-ogre/SConstruct	2007-12-09 01:08:24 UTC (rev 497)
@@ -149,7 +149,8 @@
         _env = Environment(ENV=os.environ)
         
         if environment.rpath:
-            _env.Append(RPATH=environment.rpath)
+            _env.Append(RPATH=_env.Literal(environment.rpath))
+            print "****", _env['RPATH']
         
         # Stores signatures in a separate .sconsign file 
         # in each directory as the single one was getting huge

Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py	2007-12-08 00:16:24 UTC (rev 496)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py	2007-12-09 01:08:24 UTC (rev 497)
@@ -164,7 +164,9 @@
                         os.path.join( environment.ogreal.root_dir, "python_ogreal.h" )
                         , environment.ogreal.cache_file )
 
-    defined_symbols = [ 'OGREAL_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD', 'WIN32', '_LIB', '_MBCS', 'NDEBUG' ]
+    defined_symbols = [ 'OGREAL_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD' ]
+    if os.name=='nt':
+        defined_symbols= defined_symbols + [ 'WIN32', '_LIB', '_MBCS', 'NDEBUG' ]
     defined_symbols.append( 'OGREAL_VERSION_' + environment.ogreal.version )  
     
     #


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