[mapguide-commits] r8642 - in sandbox/jng/diet/Web/src: ApacheAgent CgiAgent DotNetUnmanagedApi/Foundation DotNetUnmanagedApi/Geometry DotNetUnmanagedApi/MapGuideCommon DotNetUnmanagedApi/PlatformBase DotNetUnmanagedApi/Web HttpHandler IsapiAgent JavaApi JavaApiEx MapAgentCommon PhpApi PhpMapGuideApiEnvConfig WebApp WebSupport
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri May 1 06:04:12 PDT 2015
Author: jng
Date: 2015-05-01 06:04:12 -0700 (Fri, 01 May 2015)
New Revision: 8642
Modified:
sandbox/jng/diet/Web/src/ApacheAgent/ApacheAgent.vcxproj
sandbox/jng/diet/Web/src/CgiAgent/CgiAgent.vcxproj
sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
sandbox/jng/diet/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
sandbox/jng/diet/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
sandbox/jng/diet/Web/src/HttpHandler/HttpHandler.vcxproj
sandbox/jng/diet/Web/src/IsapiAgent/IsapiAgent.vcxproj
sandbox/jng/diet/Web/src/JavaApi/JavaApi.vcxproj
sandbox/jng/diet/Web/src/JavaApiEx/JavaApiEx.vcxproj
sandbox/jng/diet/Web/src/MapAgentCommon/MapAgentCommon.vcxproj
sandbox/jng/diet/Web/src/PhpApi/PhpApi.vcxproj
sandbox/jng/diet/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj
sandbox/jng/diet/Web/src/WebApp/WebApp.vcxproj
sandbox/jng/diet/Web/src/WebSupport/WebSupport.vcxproj
Log:
Modify the WebTier projects to use the OEM component environment variables for include and linker settings
The PostBuild and MapGuideApi projects has not been modified and is currently broken as a result of this change. Their respective files will require re-jigging to work against our new scheme.
Modified: sandbox/jng/diet/Web/src/ApacheAgent/ApacheAgent.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/ApacheAgent/ApacheAgent.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/ApacheAgent/ApacheAgent.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -102,7 +102,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;$(HTTPD_SRC)\srclib\apr\include;$(HTTPD_SRC)\srclib\apr-util\include;$(HTTPD_SRC)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr-util\include;$(MG_OEM_HTTPD_ROOT)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -111,9 +111,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -130,7 +130,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -139,9 +139,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;$(HTTPD_SRC)\srclib\apr\include;$(HTTPD_SRC)\srclib\apr-util\include;$(HTTPD_SRC)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr-util\include;$(MG_OEM_HTTPD_ROOT)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -166,9 +166,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -187,7 +187,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -195,9 +195,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Web/src/CgiAgent/CgiAgent.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/CgiAgent/CgiAgent.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/CgiAgent/CgiAgent.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -129,9 +129,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -144,7 +144,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -153,9 +153,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -170,7 +170,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -179,9 +179,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Modified: sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Modified: sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Modified: sandbox/jng/diet/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,7 +113,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\MapGuideCommonUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -150,7 +150,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\MapGuideCommonUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -186,7 +186,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -197,7 +197,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\MapGuideCommonUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -224,7 +224,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -235,7 +235,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\MapGuideCommonUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
Modified: sandbox/jng/diet/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Modified: sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,7 +113,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\WebUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -150,7 +150,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\WebUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -186,7 +186,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -197,7 +197,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\WebUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -224,7 +224,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -235,7 +235,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\WebUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
Modified: sandbox/jng/diet/Web/src/HttpHandler/HttpHandler.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/HttpHandler/HttpHandler.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/HttpHandler/HttpHandler.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;lib_jsond.lib;MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandlerd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\Oem\jsoncpp\lib\$(Configuration);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandlerd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;lib_jsond.lib;MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandlerd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\jsoncpp\lib64\$(Configuration);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandlerd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;lib_json.lib;MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandler.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\Oem\jsoncpp\lib\$(Configuration);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandler.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;lib_json.lib;MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandler.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\jsoncpp\lib64\$(Configuration);..\..\..\common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandler.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Web/src/IsapiAgent/IsapiAgent.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/IsapiAgent/IsapiAgent.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/IsapiAgent/IsapiAgent.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -142,7 +142,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -167,7 +167,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: sandbox/jng/diet/Web/src/JavaApi/JavaApi.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/JavaApi/JavaApi.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/JavaApi/JavaApi.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -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 -DJAVA -DWIN32 -dllname MapGuideJavaApid -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 MapGuideJavaApi -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 -DJAVA -DWIN32 -dllname MapGuideJavaApid -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 MapGuideJavaApi -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>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,9 +118,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.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 -DJAVA -DWIN32 -dllname MapGuideJavaApid -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 MapGuideJavaApi -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 -DJAVA -DWIN32 -dllname MapGuideJavaApid -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 MapGuideJavaApi -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>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -158,9 +158,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.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 -DJAVA -DWIN32 -dllname MapGuideJavaApi -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 MapGuideJavaApi -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 -DJAVA -DWIN32 -dllname MapGuideJavaApi -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 MapGuideJavaApi -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...
@@ -188,7 +188,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApi.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 -DJAVA -DWIN32 -dllname MapGuideJavaApi -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 MapGuideJavaApi -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 -DJAVA -DWIN32 -dllname MapGuideJavaApi -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 MapGuideJavaApi -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>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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>
@@ -238,9 +238,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/JavaApiEx/JavaApiEx.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/JavaApiEx/JavaApiEx.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -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 MapGuideJavaApiExd -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 MapGuideJavaApiEx -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 MapGuideJavaApiExd -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 MapGuideJavaApiEx -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>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,9 +118,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiExd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiExd.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 MapGuideJavaApiExd -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 MapGuideJavaApiEx -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 MapGuideJavaApiExd -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 MapGuideJavaApiEx -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>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -158,9 +158,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiExd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiExd.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 MapGuideJavaApiEx -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 MapGuideJavaApiEx -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 MapGuideJavaApiEx -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 MapGuideJavaApiEx -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>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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>
@@ -198,9 +198,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -215,10 +215,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 MapGuideJavaApiEx -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 MapGuideJavaApiEx -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 MapGuideJavaApiEx -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 MapGuideJavaApiEx -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...
@@ -230,7 +230,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(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>
@@ -239,9 +239,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Web/src/MapAgentCommon/MapAgentCommon.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/MapAgentCommon/MapAgentCommon.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/MapAgentCommon/MapAgentCommon.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -90,7 +90,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -101,13 +101,13 @@
<Lib>
<AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommond.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,13 +118,13 @@
<Lib>
<AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommond.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -134,13 +134,13 @@
<Lib>
<AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommon.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -150,7 +150,7 @@
<Lib>
<AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommon.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
Modified: sandbox/jng/diet/Web/src/PhpApi/PhpApi.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/PhpApi/PhpApi.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/PhpApi/PhpApi.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -93,17 +93,17 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,9 +113,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -128,17 +128,17 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -148,9 +148,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -163,17 +163,17 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -199,17 +199,17 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -218,9 +218,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -105,7 +105,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfigd.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApiEnvConfigd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -130,7 +130,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfigd.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApiEnvConfigd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -145,7 +145,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -156,7 +156,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfig.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +172,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -183,7 +183,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfig.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: sandbox/jng/diet/Web/src/WebApp/WebApp.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/WebApp/WebApp.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/WebApp/WebApp.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebAppd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebAppd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebAppd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebAppd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebApp.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebApp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebApp.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebApp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet/Web/src/WebSupport/WebSupport.vcxproj
===================================================================
--- sandbox/jng/diet/Web/src/WebSupport/WebSupport.vcxproj 2015-04-29 21:15:33 UTC (rev 8641)
+++ sandbox/jng/diet/Web/src/WebSupport/WebSupport.vcxproj 2015-05-01 13:04:12 UTC (rev 8642)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupportd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupportd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupportd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupportd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -147,7 +147,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -156,9 +156,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupport.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupport.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -175,7 +175,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -184,9 +184,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupport.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupport.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
More information about the mapguide-commits
mailing list