]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
use vsprops files for spidermonkey modules and modules using curl to centralize those...
authorMichael Jerris <mike@jerris.com>
Fri, 19 Oct 2007 16:09:14 +0000 (16:09 +0000)
committerMichael Jerris <mike@jerris.com>
Fri, 19 Oct 2007 16:09:14 +0000 (16:09 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5995 d0543943-73ff-0310-b7d9-9358b9ac24b2

13 files changed:
src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj
src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj
src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj
src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
w32/Console/FreeSwitchConsole.vcproj
w32/Library/FreeSwitchCore.vcproj
w32/curl.vsprops [new file with mode: 0644]
w32/spidermonkey.vsprops [new file with mode: 0644]

index a0c5eb0ed2b38e90655829fa154922167baaf93c..9ef3f8842e669fb6799f1f1abd36fbcbcd7405ae 100644 (file)
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;"\r
-                               PreprocessorDefinitions="XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;"\r
-                               PreprocessorDefinitions="XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index 0b0d74f5620ed6dce37cf643c031b79061318b7f..d01d002b1c664a29db43fbf110769f4ec57f9481 100644 (file)
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib"\r
-                               TargetMachine="1"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               WholeProgramOptimization="true"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               RuntimeLibrary="2"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib"\r
-                               TargetMachine="1"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index cd3b67f6df0202ca1ecdd20411755e538fd4886e..59e9735e1615e02c4630316f648bb436b725074a 100644 (file)
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib"\r
-                               TargetMachine="1"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               WholeProgramOptimization="true"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               RuntimeLibrary="2"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib"\r
-                               TargetMachine="1"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index 5ad69adf574443e9428bf5e446c44d565f2aab31..d4a078b0373badda4afb48546cd5f10d5d60e099 100644 (file)
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib"\r
-                               TargetMachine="1"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                WholeProgramOptimization="true"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
+                               AdditionalIncludeDirectories=""\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
+                               AdditionalLibraryDirectories=""\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                LinkTimeCodeGeneration="1"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib"\r
-                               TargetMachine="1"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index 13c1129abd5d31d42c813330995866a3f3fb81d1..81ce99cdb71954bd80cde06c8b6c10facd7e493b 100644 (file)
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
                                AdditionalOptions="&quot;..\..\..\..\libs\win32\js\debug\js32.lib&quot; &quot;..\..\..\..\libs\win32\apr\debug\libapr-1.lib&quot; &quot;..\..\..\..\w32\library\debug\freeswitchcore.lib&quot; &quot;..\..\..\..\libs\win32\debug\libetpan.lib&quot; &quot;..\mod_spidermonkey\debug\mod_spidermonkey.lib&quot;"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_socket.lib"\r
-                               TargetMachine="1"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;MOD_SPIDERMONKEY_SOCKET_EXPORTS"\r
-                               RuntimeLibrary="2"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index a0847b60aa1cc8395ab4257eae5fef28ffe26f78..cdf796ffb0f211a1ef7cf3ce88e0f6d7af07d860 100644 (file)
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib"\r
-                               TargetMachine="1"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               WholeProgramOptimization="true"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"\r
-                               RuntimeLibrary="2"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
-                               SubSystem="2"\r
+                               AdditionalLibraryDirectories=""\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                LinkTimeCodeGeneration="1"\r
-                               ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib"\r
-                               TargetMachine="1"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index d1f7b3ec7356e9d3f604cbda064d3ca70bfc893a..c8ab1a2df5773af4ed1da3b9e89e12f46400cdd4 100644 (file)
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
-                               PreprocessorDefinitions="CURL_STATICLIB"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
-                               PreprocessorDefinitions="CURL_STATICLIB"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
index 826a8a2b32c8434d2911225c728a48cc4482982f..8448774f941d93a557d803a3e58a5f99ed468dd3 100644 (file)
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
-                               PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibD&quot;"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
-                               PreprocessorDefinitions="CURL_STATICLIB"\r
+                               AdditionalIncludeDirectories=""\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibR&quot;"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index aaa24dbfcd385cea83ffedc8ab25ac06ca821502..4a8e411a99852d24332d1fa44e57ef25105ac60f 100644 (file)
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
-                               PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"\r
+                               PreprocessorDefinitions="ABYSS_WIN32"\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
+                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
-                               PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"\r
+                               PreprocessorDefinitions="ABYSS_WIN32"\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
index 38dcbaac997b920df452754c6735b02e68d99a3c..e3ec9b4bd10605eeebe19c302e222c6a8e5821a4 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
+                       InheritedPropertySheets="..\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
                        >\r
@@ -63,7 +64,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="advapi32.lib"\r
                                OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(OutDir)"\r
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
+                       InheritedPropertySheets="..\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="advapi32.lib"\r
                                OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(OutDir)"\r
index a9a3dc9452f2b859a073794998f3fa49ba432205..f9236021dd8f374d27be6b9a44956dd90d795989 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
                        >\r
@@ -69,7 +70,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib"\r
                                OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;"\r
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
                        >\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib"\r
                                OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\include\private\switch_core.h"\r
+                               RelativePath="..\..\src\include\switch_core.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\include\switch_core.h"\r
+                               RelativePath="..\..\src\include\private\switch_core.h"\r
                                >\r
                        </File>\r
                        <File\r
diff --git a/w32/curl.vsprops b/w32/curl.vsprops
new file mode 100644 (file)
index 0000000..0142a15
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>\r
+<VisualStudioPropertySheet \r
+       ProjectType="Visual C++" \r
+       Version="8.00" \r
+       Name="curl"\r
+       >\r
+</VisualStudioPropertySheet>\r
diff --git a/w32/spidermonkey.vsprops b/w32/spidermonkey.vsprops
new file mode 100644 (file)
index 0000000..76f14cb
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>\r
+<VisualStudioPropertySheet \r
+       ProjectType="Visual C++" \r
+       Version="8.00" \r
+       Name="spidermonkey"\r
+       >\r
+</VisualStudioPropertySheet>\r