]> 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: 2f208a6)
FS-5167 add version stuff to vs2010
authorJeff Lenk <jeff@jefflenk.com>
Tue, 9 Apr 2013 23:12:47 +0000 (18:12 -0500)
committerTravis Cross <tc@traviscross.com>
Fri, 7 Jun 2013 07:26:13 +0000 (07:26 +0000)
Freeswitch.2010.sln patch | blob | blame | history
libs/esl/fs_cli.2010.vcxproj patch | blob | blame | history
libs/esl/fs_cli.2010.vcxproj.filters patch | blob | blame | history
libs/esl/fs_cli.2012.vcxproj patch | blob | blame | history
w32/Console/FreeSwitchConsole.2010.vcxproj patch | blob | blame | history
w32/Console/FreeSwitchConsole.2010.vcxproj.filters patch | blob | blame | history
w32/Library/FreeSwitchCore.2010.vcxproj patch | blob | blame | history
w32/Library/FreeSwitchCore.2010.vcxproj.filters patch | blob | blame | history
w32/Library/FreeSwitchCore.2012.vcxproj patch | blob | blame | history

diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index 9f76dde7c9518522ef32f666b5da001db26e657b..d620087405fce9d4afc33e51f38cd171dbc528c3 100644 (file)
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -3905,8 +3905,8 @@ Global
                {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
+               {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}\r
                {ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}\r
diff --git a/libs/esl/fs_cli.2010.vcxproj b/libs/esl/fs_cli.2010.vcxproj
index 69d364ad4802627bafefb429cd9ef4f37cafe8d6..f7560052cfce7c180581b799fb96c43277f06cd3 100644 (file)
--- a/libs/esl/fs_cli.2010.vcxproj
+++ b/libs/esl/fs_cli.2010.vcxproj
@@ -201,6 +201,21 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="fs_cli.rc">\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+      </PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>\r
+    </ResourceCompile>  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="switch_version.rc2" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
diff --git a/libs/esl/fs_cli.2010.vcxproj.filters b/libs/esl/fs_cli.2010.vcxproj.filters
index dfc1faab80b6f891f44406335a0af4ca9520ca63..cd2e7a6bf722e34590fe779d8bb9f201209a8342 100644 (file)
--- a/libs/esl/fs_cli.2010.vcxproj.filters
+++ b/libs/esl/fs_cli.2010.vcxproj.filters
@@ -9,7 +9,7 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
     </Filter>\r
-    <Filter Include="Resource Files">\r
+    <Filter Include="Version Files">\r
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>\r
     </Filter>\r
@@ -27,4 +27,14 @@
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="fs_cli.rc">\r
+      <Filter>Version Files</Filter>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="switch_version.rc2">\r
+      <Filter>Version Files</Filter>\r
+    </None>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file
diff --git a/libs/esl/fs_cli.2012.vcxproj b/libs/esl/fs_cli.2012.vcxproj
index 140736b9dd0913d0c831ca1f9c55c51f3a1b3a40..77507f7b586bded1ca0005124253f44b32af7038 100644 (file)
--- a/libs/esl/fs_cli.2012.vcxproj
+++ b/libs/esl/fs_cli.2012.vcxproj
@@ -216,9 +216,6 @@
       </PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>\r
-      <ShowProgress Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ShowProgress>\r
-      <ResourceOutputFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName).res</ResourceOutputFileName>\r
-      <DeploymentContent>false</DeploymentContent>\r
     </ResourceCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
diff --git a/w32/Console/FreeSwitchConsole.2010.vcxproj b/w32/Console/FreeSwitchConsole.2010.vcxproj
index c60641ac6c647b13337d7825e13bcea77d014a85..ee212e438b589e0a2d70d95ec7d401a20a583bc9 100644 (file)
--- a/w32/Console/FreeSwitchConsole.2010.vcxproj
+++ b/w32/Console/FreeSwitchConsole.2010.vcxproj
@@ -209,6 +209,23 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
   </ItemGroup>\r
+    <ItemGroup>\r
+    <ResourceCompile Include="FreeSwitchConsole.rc">\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+      </PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="switch_version.rc2" />\r
+  </ItemGroup>\r
+\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
diff --git a/w32/Console/FreeSwitchConsole.2010.vcxproj.filters b/w32/Console/FreeSwitchConsole.2010.vcxproj.filters
index 3dd6a6f965e7b9410b3dfa5a4fdd72c5cc951113..8a19b0149501f0925967cdd9c841bea02197c9b3 100644 (file)
--- a/w32/Console/FreeSwitchConsole.2010.vcxproj.filters
+++ b/w32/Console/FreeSwitchConsole.2010.vcxproj.filters
@@ -9,7 +9,7 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
     </Filter>\r
-    <Filter Include="Resource Files">\r
+    <Filter Include="Version Files">\r
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>\r
     </Filter>\r
@@ -57,4 +57,14 @@
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="FreeSwitchConsole.rc">\r
+      <Filter>Version Files</Filter>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="switch_version.rc2">\r
+      <Filter>Version Files</Filter>\r
+    </None>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index 2cabdff823a253c8c5d2a274d624a9ee4c5deb1c..47ddf4567758eba3a879a22a77009569f0424937 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -783,6 +783,15 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c;%(AdditionalInputs)</AdditionalInputs>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\include\switch_version.h;lastversion;%(Outputs)</Outputs>\r
     </CustomBuild>\r
+    <CustomBuild Include="switch_version.inc.template">\r
+      <Message>Generating switch_version.inc</Message>\r
+      <Command>cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version  "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)switch_version.inc.template" "$(ProjectDir)switch_version.inc"</Command>\r
+      <Outputs>$(ProjectDir)switch_version.inc</Outputs>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>\r
+    </CustomBuild>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\..\libs\libteletone\libteletone.2010.vcxproj">\r
@@ -833,7 +842,20 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="FreeSwitchCoreLib.rc">\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+      </PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)</AdditionalIncludeDirectories>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="switch_version.rc2" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
index 7283c0b6ad048975e0d2cd1aee61eaec9aaf04ed..30bc60906c1f168fae969a9af234a85144988e83 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
@@ -337,9 +337,6 @@
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <CustomBuild Include="..\..\src\include\switch_version.h.template" />\r
-  </ItemGroup>\r
   <ItemGroup>\r
     <Filter Include="Header Files">\r
       <UniqueIdentifier>{a2ba3786-6272-4d39-8004-9afeed96cdc6}</UniqueIdentifier>\r
@@ -347,5 +344,26 @@
     <Filter Include="Source Files">\r
       <UniqueIdentifier>{a1474195-5783-4c77-977f-59657b38fd01}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="Version Files">\r
+      <UniqueIdentifier>{5eed22da-78ee-47ae-8c7f-7760ddbee518}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="switch_version.inc.template">\r
+      <Filter>Version Files</Filter>\r
+    </CustomBuild>\r
+    <CustomBuild Include="..\..\src\include\switch_version.h.template">\r
+      <Filter>Version Files</Filter>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="switch_version.rc2">\r
+      <Filter>Version Files</Filter>\r
+    </None>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="FreeSwitchCoreLib.rc">\r
+      <Filter>Version Files</Filter>\r
+    </ResourceCompile>\r
   </ItemGroup>\r
 </Project>\r
diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj
index 85177378be3193c963caa7acde9f8dd0a374a4c8..16a1e2fe94a8ab678c5bd7438b3ea8929d6c9bcd 100644 (file)
--- a/w32/Library/FreeSwitchCore.2012.vcxproj
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj
@@ -862,8 +862,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)</AdditionalIncludeDirectories>\r
-      <ShowProgress Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ShowProgress>\r
-      <ResourceOutputFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName).res</ResourceOutputFileName>\r
     </ResourceCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
Mirror of https://github.com/signalwire/freeswitch.git