activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1516566 - in /activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build: activemq-cpp-example.vcxproj activemq-cpp.vcxproj
Date Thu, 22 Aug 2013 19:52:28 GMT
Author: tabish
Date: Thu Aug 22 19:52:28 2013
New Revision: 1516566

URL: http://svn.apache.org/r1516566
Log:
https://issues.apache.org/jira/browse/AMQCPP-507

some improvements to the build 

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj?rev=1516566&r1=1516565&r2=1516566&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp-example.vcxproj Thu
Aug 22 19:52:28 2013
@@ -83,7 +83,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;WIN32_LEAN_AND_MEAN;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\src\examples;..\src\main;$(APR_DIST)\$(PlatformName)\include;$(CPPUNIT_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeaderFile>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj?rev=1516566&r1=1516565&r2=1516566&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2010-build/activemq-cpp.vcxproj Thu Aug 22
19:52:28 2013
@@ -23,6 +23,7 @@
     <ClCompile Include="..\src\main\activemq\cmsutil\ProducerCallback.cpp" />
     <ClCompile Include="..\src\main\activemq\cmsutil\ResourceLifecycleManager.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\%(FileName)CMS.obj</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\%(FileName)CMS.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\src\main\activemq\cmsutil\SessionCallback.cpp" />
     <ClCompile Include="..\src\main\activemq\cmsutil\SessionPool.cpp" />
@@ -525,8 +526,14 @@
     <ClCompile Include="..\src\main\decaf\internal\util\ResourceLifecycleManager.cpp"
/>
     <ClCompile Include="..\src\main\decaf\internal\util\StringUtils.cpp" />
     <ClCompile Include="..\src\main\decaf\internal\util\TimerTaskHeap.cpp" />
-    <ClCompile Include="..\src\main\decaf\internal\util\zip\adler32.c" />
-    <ClCompile Include="..\src\main\decaf\internal\util\zip\crc32.c" />
+    <ClCompile Include="..\src\main\decaf\internal\util\zip\adler32.c">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\%(FileName)ZLib.obj</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\%(FileName)ZLib.obj</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\src\main\decaf\internal\util\zip\crc32.c">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\%(FileName)ZLib.obj</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\%(FileName)ZLib.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\src\main\decaf\internal\util\zip\deflate.c" />
     <ClCompile Include="..\src\main\decaf\internal\util\zip\gzclose.c" />
     <ClCompile Include="..\src\main\decaf\internal\util\zip\gzlib.c" />
@@ -1534,7 +1541,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;APR_DECLARE_STATIC;APU_DECLARE_STATIC;API_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;APR_DECLARE_STATIC;APU_DECLARE_STATIC;API_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(CPPUNIT_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CreateHotpatchableImage>false</CreateHotpatchableImage>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>



Mime
View raw message