[mapguide-commits] r8655 - in sandbox/jng/diet/Desktop: DesktopUnmanagedApi/DotNet DesktopUnmanagedApi/JavaApiEx MgDesktop UnitTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun May 3 08:29:37 PDT 2015
Author: jng
Date: 2015-05-03 08:29:37 -0700 (Sun, 03 May 2015)
New Revision: 8655
Modified:
sandbox/jng/diet/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
sandbox/jng/diet/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
sandbox/jng/diet/Desktop/MgDesktop/MgDesktop.vcxproj
sandbox/jng/diet/Desktop/UnitTest/UnitTest.vcxproj
Log:
Update mg-desktop projects to use new environment variables
Modified: sandbox/jng/diet/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
===================================================================
--- sandbox/jng/diet/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj 2015-05-03 12:18:17 UTC (rev 8654)
+++ sandbox/jng/diet/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj 2015-05-03 15:29:37 UTC (rev 8655)
@@ -77,15 +77,15 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,9 +94,9 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\debug\MapGuideDesktopUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\Debug;..\..\..\Common\lib\$(Configuration);..\..\..\Oem\FDO\Lib;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\Debug;..\..\..\Common\lib\$(Configuration);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>..\lib\debug\MapGuideDesktopUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
@@ -106,16 +106,16 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -123,9 +123,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\release\$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\release;..\..\..\Common\lib\$(Configuration);..\..\..\Oem\FDO\Lib;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\release;..\..\..\Common\lib\$(Configuration);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
@@ -142,10 +142,10 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<Midl>
@@ -153,7 +153,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -162,9 +162,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\debug\MapGuideDesktopUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\Debug64;..\..\..\Common\lib\$(Configuration)64;..\..\..\Oem\FDO\Lib64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\Debug64;..\..\..\Common\lib\$(Configuration)64;$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>..\lib\debug\MapGuideDesktopUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
@@ -174,10 +174,10 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<Midl>
@@ -186,7 +186,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -194,9 +194,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\release64\$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\Release64;..\..\..\Common\lib\$(Configuration)64;..\..\..\Oem\FDO\Lib64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\Release64;..\..\..\Common\lib\$(Configuration)64;$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
Modified: sandbox/jng/diet/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/diet/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj 2015-05-03 12:18:17 UTC (rev 8654)
+++ sandbox/jng/diet/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj 2015-05-03 15:29:37 UTC (rev 8655)
@@ -93,10 +93,10 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -108,7 +108,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
@@ -118,9 +118,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\debug;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\debug;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,10 +133,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -148,7 +148,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
@@ -158,9 +158,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\debug64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\debug64;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,10 +173,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -189,7 +189,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -197,9 +197,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\release;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\release;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -214,10 +214,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -229,7 +229,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -237,9 +237,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\release64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\release64;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Desktop/MgDesktop/MgDesktop.vcxproj
===================================================================
--- sandbox/jng/diet/Desktop/MgDesktop/MgDesktop.vcxproj 2015-05-03 12:18:17 UTC (rev 8654)
+++ sandbox/jng/diet/Desktop/MgDesktop/MgDesktop.vcxproj 2015-05-03 15:29:37 UTC (rev 8655)
@@ -82,7 +82,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -93,10 +93,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)MgDesktopd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -121,7 +121,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -130,9 +130,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -155,7 +155,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -166,10 +166,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)MgDesktopd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -197,7 +197,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,9 +206,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Desktop/UnitTest/UnitTest.vcxproj
===================================================================
--- sandbox/jng/diet/Desktop/UnitTest/UnitTest.vcxproj 2015-05-03 12:18:17 UTC (rev 8654)
+++ sandbox/jng/diet/Desktop/UnitTest/UnitTest.vcxproj 2015-05-03 15:29:37 UTC (rev 8655)
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -84,19 +84,19 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunitd.lib;MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\Lib\debug;..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\Lib\debug;$(MG_OEM_CPPUNIT_LIB_DIR)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\debug\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\debug\ACEd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Debug\GEOSd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACEd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOSd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Debug\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(Configuration)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -110,10 +110,10 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -123,7 +123,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -132,19 +132,19 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunitd.lib;MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\debug64;..\..\Oem\CppUnit-1.9.14\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\Lib\debug64;$(MG_OEM_CPPUNIT_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\debug64\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\debug64\ACEd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug64\xerces-c_3_1mgD.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Debug64\GEOSd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug64\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug64\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACEd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOSd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Debug64\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug64\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\Debug64\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -158,10 +158,10 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -177,8 +177,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib;MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\Lib\release;..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\Lib\release;$(MG_OEM_CPPUNIT_LIB_DIR)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
@@ -188,11 +188,11 @@
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\release\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\Release\ACE.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin\Release\xerces-c_3_1mg.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Release\GEOS.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACE.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOS.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Release\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Release\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(Configuration)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -206,11 +206,11 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
-xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
+xcopy /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.txt $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -221,7 +221,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -229,8 +229,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib;MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\release64;..\..\Oem\CppUnit-1.9.14\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\Lib\release64;$(MG_OEM_CPPUNIT_LIB_DIR)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
@@ -240,11 +240,11 @@
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib64\Release\ACE.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin64\Release\xerces-c_3_1mg.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Release64\GEOS.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release64\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release64\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACE.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOS.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Release64\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Release64\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -258,11 +258,11 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
-xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
+xcopy /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.txt $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
More information about the mapguide-commits
mailing list