Author: mikej Date: Thu Jan 29 11:07:18 2009 New Revision: 11556 Log: build integration Added: freeswitch/trunk/libs/spandsp/src/libtiff.vcproj Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.sln freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.sln ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.sln (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.sln Thu Jan 29 11:07:18 2009 @@ -4,10 +4,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.vcproj", "{CF70F278-3364-4395-A2E1-23501C9B8AD2}" ProjectSection(ProjectDependencies) = postProject {1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94} + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "at_dictionary_gen", "src\msvc\at_dictionary_gen.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -22,6 +25,10 @@ {1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.Build.0 = Debug|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj Thu Jan 29 11:07:18 2009 @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\libtiff\include;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -118,7 +118,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\libtiff\include;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" Added: freeswitch/trunk/libs/spandsp/src/libtiff.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/libtiff.vcproj Thu Jan 29 11:07:18 2009 @@ -0,0 +1,376 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libtiff" + ProjectGUID="{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + RootNamespace="libtiff" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h" /Y if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tif_config.h" /Y" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + DebugInformationFormat="4" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h" /Y if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tif_config.h" /Y" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="0" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\tiff\libtiff\tif_aux.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_close.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_codec.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_color.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_compress.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_dir.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_dirinfo.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_dirread.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_dirwrite.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_dumpmode.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_error.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_extension.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_fax3.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_fax3sm.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_flush.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_getimage.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_jpeg.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_luv.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_lzw.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_next.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_ojpeg.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_open.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_packbits.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_pixarlog.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_predict.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_print.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_read.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_strip.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_swab.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_thunder.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_tile.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_unix.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_version.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_warning.c" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_write.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_zip.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + > + <File + RelativePath="..\..\tiff\libtiff\t4.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_dir.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_fax3.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tif_predict.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tiff.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tiffconf.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tiffio.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tiffio.hxx" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tiffiop.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\tiffvers.h" + > + </File> + <File + RelativePath="..\..\tiff\libtiff\uvcode.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head Thu Jan 29 11:07:18 2009 @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\libtiff\include" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\tiff\libtiff" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -118,7 +118,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\libtiff\include" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\tiff\libtiff" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0"