[mapguide-commits] r8247 - in sandbox/jng/v30: . Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-06-19 00:11:10 -0700 (Thu, 19 Jun 2014)
New Revision: 8247

Modified:
   sandbox/jng/v30/
   sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h
   sandbox/jng/v30/build_oem.sh
Log:
Merged revision(s) 8240-8241 from trunk/MgDev:
Fix Linux build. 
Change the include file name to "cs_WktObject.hpp" because Linux is case sensitive.
........
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.
........



Property changes on: sandbox/jng/v30
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
/trunk/MgDev:8229
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
/trunk/MgDev:8229,8240-8241

Modified: sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h
===================================================================
--- sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h	2014-06-18 19:18:53 UTC (rev 8246)
+++ sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h	2014-06-19 07:11:10 UTC (rev 8247)
@@ -22,7 +22,7 @@
 #ifdef min
 #undef min
 #endif
-#include "CS_wktObject.hpp"
+#include "cs_WktObject.hpp"
 #include "cs_wkt.h"
 #include "CsmapVersion.h"
 

Modified: sandbox/jng/v30/build_oem.sh
===================================================================
--- sandbox/jng/v30/build_oem.sh	2014-06-18 19:18:53 UTC (rev 8246)
+++ sandbox/jng/v30/build_oem.sh	2014-06-19 07:11:10 UTC (rev 8247)
@@ -584,9 +584,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
@@ -594,9 +594,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