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

[<mi...@us...>]

Revision: 698
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=698&view=rev
Author:   mithro
Date:     2008-08-18 09:03:58 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
Fix the MT version and make it the default.

Modified Paths:
--------------
    trunk/python-ogre/boost/Makefile
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/boost/Makefile
===================================================================
--- trunk/python-ogre/boost/Makefile	2008-08-18 08:56:44 UTC (rev 697)
+++ trunk/python-ogre/boost/Makefile	2008-08-18 09:03:58 UTC (rev 698)
@@ -2,14 +2,14 @@
 PREFIX := '/usr'
 GCC_VERSION=`gcc --version | head -1 | sed -e's/.*) \([0-9]\)\.\([0-9]\).*/\1\2/'`
 PYTHON_VERSION=`python -V 2>&1 | sed -e's/Python \(2\.[45]\).*/\1/'`
-MT_VERSION=`if [ x${MT} = True ]; then echo "mt-"; fi`
-MT_FLAGS=`if [ x${MT} = True ]; then echo "-D_MT"; fi`
+MT_VERSION=`if [ x${MT} = xTrue ]; then echo "mt-"; fi`
+MT_FLAGS=`if [ x${MT} = xTrue ]; then echo "-D_MT"; fi`
 
 CXXFLAGS=-I.  \
        -I/usr/include/python${PYTHON_VERSION} \
        -shared \
 		-Wl,-soname,libboost_python_index-gcc${GCC_VERSION}-${BOOST_VERSION}.so \
-		-o libboost_python_index-gcc${GCC_VERSION}-${BOOST_VERSION}.so -fPIC \
+		-o libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so -fPIC \
        -lboost_python-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION} \
        -L${PREFIX}/lib/ \
        -lpython${PYTHON_VERSION} \
@@ -31,13 +31,10 @@
 install:
 	@make version
 	mkdir -p ${PREFIX}/usr/lib
-	if [ x${MT} = xTrue ]; then \
-		cp libboost_python_index-gcc${GCC_VERSION}-mt-${BOOST_VERSION}.so ${PREFIX}/usr/lib; \
-		ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-mt-${BOOST_VERSION}.so ${PREFIX}/usr/lib/libboost_python_index.so; \
-	else \
-		cp libboost_python_index-gcc${GCC_VERSION}-${BOOST_VERSION}.so ${PREFIX}/usr/lib; \
-		ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-${BOOST_VERSION}.so ${PREFIX}/usr/lib/libboost_python_index.so; \
-	fi
+	@echo cp libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib
+	@cp libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib
+	@echo ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib/libboost_python_index.so
+	@ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so ${PREFIX}/usr/lib/libboost_python_index.so
 	
 	mkdir -p ${PREFIX}/usr/include
 	cp -rvf boost ${PREFIX}/usr/include

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-08-18 08:56:44 UTC (rev 697)
+++ trunk/python-ogre/environment.py	2008-08-18 09:03:58 UTC (rev 698)
@@ -523,7 +523,7 @@
     ModuleName = ""
     base = "libboost-python%s-index" % version.replace("_",".")
     if isLinux() or isMac():
-        FLAGS = "PREFIX=%s BOOST_VERSION=%s" % (PREFIX, version)
+        FLAGS = "PREFIX=%s BOOST_VERSION=%s MT=True" % (PREFIX, version)
         source = [
              ["rm","-rf %s" % (base,), os.getcwd()],
              ["cp",'-rvf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],


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