[mapguide-commits] r8640 - sandbox/jng/diet_oem

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-04-29 14:13:33 -0700 (Wed, 29 Apr 2015)
New Revision: 8640

Modified:
   sandbox/jng/diet_oem/setenvironment.bat
Log:
Update setenvironment.bat to parameterize key OEM binary paths

Modified: sandbox/jng/diet_oem/setenvironment.bat
===================================================================
--- sandbox/jng/diet_oem/setenvironment.bat	2015-04-29 19:33:19 UTC (rev 8639)
+++ sandbox/jng/diet_oem/setenvironment.bat	2015-04-29 21:13:33 UTC (rev 8640)
@@ -59,10 +59,11 @@
 SET MG_OEM_ACE_INC_DIR=%CD%\ACE\ACE_Wrappers
 SET MG_OEM_ACE_LIB_DIR=%CD%\ACE\ACE_Wrappers\lib%MG_OEM_PLAT_SHORT%\%MG_OEM_CONFIG%
 SET MG_OEM_ACE_LIBS=ACE%MG_OEM_ACE_DEBUG_SUFFIX%.lib
+SET MG_OEM_ACE_BIN_DIR=%MG_OEM_ACE_LIB_DIR%
 REM ==================== AGG ==========================
 REM ==================== CppUnit ======================
 SET MG_OEM_CPPUNIT_INC_DIR=%CD%\CppUnit-1.9.14\include
-SET MG_OEM_CPPUNIT_LIB_DIR=%CD%\CppUnit-1.9.14\lib%MG_OEM_PLAT_SHORT%
+SET MG_OEM_CPPUNIT_LIB_DIR=%CD%\CppUnit-1.9.14\lib%MG_OEM_PLAT_SHORT%\%MG_OEM_CONFIG%
 SET MG_OEM_CPPUNIT_LIBS=CppUnit%MG_OEM_CPPUNIT_DEBUG_SUFFIX%.lib
 REM ==================== CS-Map =======================
 SET MG_OEM_CSMAP_INC_DIR=%CD%\CsMap\Include
@@ -71,7 +72,8 @@
 REM ==================== DBXML ========================
 SET MG_OEM_DBXML_INC_DIR=%CD%\dbxml\include\dbxml
 SET MG_OEM_DBXML_LIB_DIR=%CD%\dbxml\lib%MG_OEM_PLAT_SHORT%\%MG_OEM_CONFIG%
-SET MG_OEM_DBXML_LIBS=libdbxml25%MG_OEM_DBXML_DEBUG_SUFFIX%.lib
+SET MG_OEM_DBXML_LIBS=libdbxml25%MG_OEM_DBXML_DEBUG_SUFFIX%.lib;libdb48%MG_OEM_DBXML_DEBUG_SUFFIX%.lib
+SET MG_OEM_DBXML_BIN_DIR=%CD%\dbxml\bin%MG_OEM_PLAT_SHORT%\%MG_OEM_CONFIG%
 SET MG_OEM_XERCES_INC_DIR=%CD%\dbxml\include
 SET MG_OEM_XERCES_LIB_DIR=%CD%\dbxml\lib%MG_OEM_PLAT_SHORT%\%MG_OEM_CONFIG%
 SET MG_OEM_XERCES_LIBS=xerces-c_3mg%MG_OEM_XERCES_DEBUG_SUFFIX%.lib
@@ -79,14 +81,20 @@
 SET MG_OEM_DWFTK_INC_DIR=%CD%\DWFTK\develop\global\src
 SET MG_OEM_DWFTK_LIB_DIR=%CD%\DWFTK\develop\global\lib\%MG_OEM_PLATFORM%\static\%MG_OEM_CONFIG%\vc10.0
 SET MG_OEM_DWFTK_LIBS=dwfcore_wt.1.7.0%MG_OEM_DBXML_DEBUG_SUFFIX%.lib;dwftk_wt.7.7.0%MG_OEM_DBXML_DEBUG_SUFFIX%.lib;whiptk_wt.7.13.601%MG_OEM_DBXML_DEBUG_SUFFIX%.lib
+SET MG_OEM_DWFTK_LIBS_RENDERERS=%MG_OEM_DWFTK_LIBS%;w3dtk_wt.1.7.1555%MG_OEM_DBXML_DEBUG_SUFFIX%.lib
+SET MG_OEM_DWFTK_LIBS_DRAWING_SVC=%MG_OEM_DWFTK_LIBS_RENDERERS%
+SET MG_OEM_DWFTK_LIBS_KML_SVC=dwfcore_wt.1.7.0%MG_OEM_DBXML_DEBUG_SUFFIX%.lib
+SET MG_OEM_DWFTK_LIBS_RESOURCE_SVC=dwfcore_wt.1.7.0%MG_OEM_DBXML_DEBUG_SUFFIX%.lib
 REM ==================== FDO ==========================
-SET MG_OEM_FDO_INC_DIR=%CD%\FDO\Bin\Release%MG_OEM_PLAT_SHORT%
-SET MG_OEM_FDO_LIB_DIR=%CD%\FDO\Lib%MG_OEM_PLAT_SHORT%
+SET MG_OEM_FDO_ROOT=%CD%\FDO
+SET MG_OEM_FDO_INC_DIR=%MG_OEM_FDO_ROOT%\Inc
+SET MG_OEM_FDO_LIB_DIR=%MG_OEM_FDO_ROOT%\Lib%MG_OEM_PLAT_SHORT%
 SET MG_OEM_FDO_LIBS=FDO%MG_FDO_DEBUG_SUFFIX%.lib
 REM ==================== GD ===========================
 SET MG_OEM_GD_INC_DIR=%CD%\gd\gd
 SET MG_OEM_GD_LIB_DIR=%CD%\gd\build\win32\gd\%MG_OEM_CONFIG%%MG_OEM_PLAT_SHORT%
 SET MG_OEM_GD_LIBS=gd%MG_FDO_DEBUG_SUFFIX%.lib
+SET MG_OEM_GD_BIN_DIR=%MG_OEM_GD_LIB_DIR%
 SET MG_OEM_FREETYPE_INC_DIR=%CD%\gd\freetype\include
 SET MG_OEM_FREETYPE_LIB_DIR=%CD%\gd\freetype\objs\%MG_OEM_CONFIG%%MG_OEM_PLAT_SHORT%\
 SET MG_OEM_FREETYPE_LIBS=freetype235%MG_FDO_DEBUG_SUFFIX%.lib
@@ -103,6 +111,7 @@
 SET MG_OEM_GEOS_INC_DIR=%CD%\geos\include
 SET MG_OEM_GEOS_LIB_DIR=%CD%\geos\VisualStudio\%MG_OEM_CONFIG%%MG_OEM_PLAT_SHORT%
 SET MG_OEM_GEOS_LIBS=GEOS%MG_FDO_DEBUG_SUFFIX%.lib
+SET MG_OEM_GEOS_BIN_DIR=%MG_OEM_GEOS_LIB_DIR%
 REM ==================== HTTPD ========================
 SET MG_OEM_HTTPD_INC_DIR=%CD%\LinuxApt\httpd-2.4.10\include
 SET MG_OEM_HTTPD_LIB_DIR=%CD%\httpd\lib%MG_OEM_PLAT_SHORT%