[mapguide-commits] r8241 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2014-06-18 01:37:30 -0700 (Wed, 18 Jun 2014)
New Revision: 8241

Modified:
   trunk/MgDev/build_oem.sh
Log:
Fix Linux build.
The make file Oem/CsMap/Source/Library.mak and Oem/CsMap/Dictionaries/Compiler.mak are changed in http://trac.osgeo.org/csmap/changeset/2463. We need to change the build script in build_oem.sh accordingly.

Modified: trunk/MgDev/build_oem.sh
===================================================================
--- trunk/MgDev/build_oem.sh	2014-06-18 07:37:20 UTC (rev 8240)
+++ trunk/MgDev/build_oem.sh	2014-06-18 08:37:30 UTC (rev 8241)
@@ -624,9 +624,9 @@
         sed 's/^C_FLG =/C_FLG = -fPIC/g' Library.mak | sed 's/CPP_FLG =/CPP_FLG = -fPIC/g' > Library64.mak
         make -fLibrary64.mak
     else
-        make -fLibrary.mak
+        make -fLibrary.mak PROCESSOR=x86
     fi
-    cp CsMap.a ../.libs/libCsmap.a
+    cp ../lib47/Linux$BUILD_CPU/CsMap.a ../.libs/libCsmap.a
     popd
     pushd Dictionaries
     if [ $BUILD_CPU -eq 64 ]; then
@@ -634,9 +634,9 @@
         sed 's/^C_FLG =/C_FLG = -fPIC/g' Library.mak | sed 's/CPP_FLG =/CPP_FLG = -fPIC/g' > Compiler64.mak
         make -fCompiler64.mak
     else
-        make -fCompiler.mak
+        make -fCompiler.mak PROCESSOR=x86
     fi
-    ./CS_Comp -b . .
+
     popd
     check_build
     popd