From 092a794e41ae36ef6d315a0d8fa61889d18a78f6 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 9 Apr 2013 18:12:47 -0500 Subject: [PATCH] FS-5167 add version stuff to vs2010 --- Freeswitch.2010.sln | 2 +- libs/esl/fs_cli.2010.vcxproj | 15 ++++++++++++ libs/esl/fs_cli.2010.vcxproj.filters | 12 +++++++++- libs/esl/fs_cli.2012.vcxproj | 3 --- w32/Console/FreeSwitchConsole.2010.vcxproj | 17 +++++++++++++ .../FreeSwitchConsole.2010.vcxproj.filters | 12 +++++++++- w32/Library/FreeSwitchCore.2010.vcxproj | 24 ++++++++++++++++++- .../FreeSwitchCore.2010.vcxproj.filters | 24 ++++++++++++++++--- w32/Library/FreeSwitchCore.2012.vcxproj | 2 -- 9 files changed, 99 insertions(+), 12 deletions(-) diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln index 9f76dde7c9..d620087405 100644 --- a/Freeswitch.2010.sln +++ b/Freeswitch.2010.sln @@ -3905,8 +3905,8 @@ Global {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} {ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000} diff --git a/libs/esl/fs_cli.2010.vcxproj b/libs/esl/fs_cli.2010.vcxproj index 69d364ad48..f7560052cf 100644 --- a/libs/esl/fs_cli.2010.vcxproj +++ b/libs/esl/fs_cli.2010.vcxproj @@ -201,6 +201,21 @@ false + + + $(SolutionDir)\w32\Library + $(SolutionDir)\w32\Library + $(SolutionDir)\w32\Library + $(SolutionDir)\w32\Library + _DEBUG + + + _WIN64;_DEBUG + _WIN64 + + + + diff --git a/libs/esl/fs_cli.2010.vcxproj.filters b/libs/esl/fs_cli.2010.vcxproj.filters index dfc1faab80..cd2e7a6bf7 100644 --- a/libs/esl/fs_cli.2010.vcxproj.filters +++ b/libs/esl/fs_cli.2010.vcxproj.filters @@ -9,7 +9,7 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd - + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx @@ -27,4 +27,14 @@ Header Files + + + Version Files + + + + + Version Files + + \ No newline at end of file diff --git a/libs/esl/fs_cli.2012.vcxproj b/libs/esl/fs_cli.2012.vcxproj index 140736b9dd..77507f7b58 100644 --- a/libs/esl/fs_cli.2012.vcxproj +++ b/libs/esl/fs_cli.2012.vcxproj @@ -216,9 +216,6 @@ _WIN64;_DEBUG _WIN64 - true - $(IntDir)$(TargetName).res - false diff --git a/w32/Console/FreeSwitchConsole.2010.vcxproj b/w32/Console/FreeSwitchConsole.2010.vcxproj index c60641ac6c..ee212e438b 100644 --- a/w32/Console/FreeSwitchConsole.2010.vcxproj +++ b/w32/Console/FreeSwitchConsole.2010.vcxproj @@ -209,6 +209,23 @@ false + + + $(SolutionDir)\w32\Library + $(SolutionDir)\w32\Library + $(SolutionDir)\w32\Library + $(SolutionDir)\w32\Library + _DEBUG + + + _WIN64;_DEBUG + _WIN64 + + + + + + diff --git a/w32/Console/FreeSwitchConsole.2010.vcxproj.filters b/w32/Console/FreeSwitchConsole.2010.vcxproj.filters index 3dd6a6f965..8a19b01495 100644 --- a/w32/Console/FreeSwitchConsole.2010.vcxproj.filters +++ b/w32/Console/FreeSwitchConsole.2010.vcxproj.filters @@ -9,7 +9,7 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd - + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx @@ -57,4 +57,14 @@ Header Files + + + Version Files + + + + + Version Files + + \ No newline at end of file diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj index 7189770a2d..3a09509fd6 100644 --- a/w32/Library/FreeSwitchCore.2010.vcxproj +++ b/w32/Library/FreeSwitchCore.2010.vcxproj @@ -787,6 +787,15 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs ..\..\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) ..\..\src\include\switch_version.h;lastversion;%(Outputs) + + Generating switch_version.inc + cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)switch_version.inc.template" "$(ProjectDir)switch_version.inc" + $(ProjectDir)switch_version.inc + $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion + $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion + $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion + $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion + @@ -837,7 +846,20 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs false + + + _DEBUG + + + _WIN64;_DEBUG + _WIN64 + $(ProjectDir) + + + + + - \ No newline at end of file + diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters index f095c610c5..7956a098fa 100644 --- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters +++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters @@ -349,9 +349,6 @@ Header Files - - - {a2ba3786-6272-4d39-8004-9afeed96cdc6} @@ -359,5 +356,26 @@ {a1474195-5783-4c77-977f-59657b38fd01} + + {5eed22da-78ee-47ae-8c7f-7760ddbee518} + + + + + Version Files + + + Version Files + + + + + Version Files + + + + + Version Files + diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj index 760e13bb3e..7b1bede4d5 100644 --- a/w32/Library/FreeSwitchCore.2012.vcxproj +++ b/w32/Library/FreeSwitchCore.2012.vcxproj @@ -866,8 +866,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs _WIN64;_DEBUG _WIN64 $(ProjectDir) - true - $(IntDir)$(TargetName).res