]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0929e12)
FS-5273 --resolve windows update resource version for pthreads
authorJeff Lenk <jeff@jefflenk.com>
Sun, 14 Apr 2013 02:50:52 +0000 (21:50 -0500)
committerTravis Cross <tc@traviscross.com>
Fri, 7 Jun 2013 07:26:18 +0000 (07:26 +0000)
libs/win32/pthread/pthread.2010.vcxproj patch | blob | blame | history
libs/win32/pthread/pthread.2012.vcxproj patch | blob | blame | history

diff --git a/libs/win32/pthread/pthread.2010.vcxproj b/libs/win32/pthread/pthread.2010.vcxproj
index 76bb18976ac698540382f6f3505ce66b6797a90e..30bfd9a5e94961cd4990ed528f75ccaabc4e45c8 100644 (file)
--- a/libs/win32/pthread/pthread.2010.vcxproj
+++ b/libs/win32/pthread/pthread.2010.vcxproj
@@ -158,7 +158,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -194,7 +194,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -230,7 +230,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -266,7 +266,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -293,7 +293,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -326,7 +326,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -360,7 +360,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -393,7 +393,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
diff --git a/libs/win32/pthread/pthread.2012.vcxproj b/libs/win32/pthread/pthread.2012.vcxproj
index 986fc9ad5202d440f0169dd9b110e7a2fd8de897..1bfd717eba5e06eb74d7c62feaa178d31f8f2c54 100644 (file)
--- a/libs/win32/pthread/pthread.2012.vcxproj
+++ b/libs/win32/pthread/pthread.2012.vcxproj
@@ -166,7 +166,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -202,7 +202,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -238,7 +238,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -274,7 +274,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -301,7 +301,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -334,7 +334,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -368,7 +368,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx86;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
@@ -401,7 +401,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
     <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;PTW32_RC_MSC;PTW32_ARCHx64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
Mirror of https://github.com/signalwire/freeswitch.git