[RavenclawDev 295] [1881] Agents/MultiDecoder/Audio_Server: Modified Audio_Server to compile under MSVS 2005.
tk@edam.speech.cs.cmu.edu
tk at edam.speech.cs.cmu.edu
Wed Aug 8 17:30:27 EDT 2007
An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070808/929b4241/attachment.html
-------------- next part --------------
Property changes on: Agents/MultiDecoder/Audio_Server
___________________________________________________________________
Name: svn:ignore
+ Debug
Release
Modified: Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj
===================================================================
--- Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-08 21:27:02 UTC (rev 1880)
+++ Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-08 21:30:25 UTC (rev 1881)
@@ -1,123 +1,184 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="Audio_Server"
ProjectGUID="{C31484B0-179B-432D-AE1E-75FB90591F23}"
- SccProjectName="SAK"
- SccAuxPath="SAK"
- SccLocalPath="SAK"
- SccProvider="SAK"
- Keyword="Win32Proj">
+ RootNamespace="Audio_Server"
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\Libraries\Galaxy\include;..\..\..\Libraries\Galaxy\contrib\MITRE\utilities\include;..\..\..\Libraries\sphinx2\src\libsphinx2\include;..\..\..\Libraries\sphinx2\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="TRUE"
+ MinimalRebuild="true"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="../../../Libraries/Galaxy/lib/x86-nt/libGalaxy_debug.lib ..\..\..\Libraries\Galaxy\contrib\MITRE\utilities\lib\x86-nt\libMITRE_galaxy_debug.lib wsock32.lib winmm.lib ../../../Libraries/sphinx2/lib/Debug/libsphinx2.lib ../../../Libraries/sphinx2/lib/Debug/libsphinx2ad.lib ../../../Libraries/sphinx2/lib/Debug/libsphinx2fe.lib"
OutputFile="$(OutDir)/Audio_Server.exe"
LinkIncremental="2"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/Audio_Server.pdb"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetPath) ..\..\..\bin\x86-nt\$(TargetName)-DEBUG.exe"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(TargetPath) ..\..\..\bin\x86-nt\$(TargetName)-DEBUG.exe"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- OmitFramePointers="TRUE"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\..\Libraries\Galaxy\include;..\..\..\Libraries\Galaxy\contrib\MITRE\utilities\include;..\..\..\Libraries\sphinx2\src\libsphinx2\include;..\..\..\Libraries\sphinx2\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MBCS"
- StringPooling="TRUE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MBCS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
- AdditionalDependencies="../../../Libraries/Galaxy/lib/x86-nt/libGalaxy.lib ..\..\..\Libraries\Galaxy\contrib\MITRE\utilities\lib\x86-nt\libMITRE_galaxy_debug.lib wsock32.lib winmm.lib ../../../Libraries/sphinx2/lib/Release/libsphinx2.lib ../../../Libraries/sphinx2/lib/Release/libsphinx2ad.lib ../../../Libraries/sphinx2/lib/Release/libsphinx2fe.lib"
+ AdditionalDependencies="../../../Libraries/Galaxy/lib/x86-nt/libGalaxy.lib ..\..\..\Libraries\Galaxy\contrib\MITRE\utilities\lib\x86-nt\libMITRE_galaxy_debug.lib wsock32.lib winmm.lib"
OutputFile="$(OutDir)/Audio_Server.exe"
LinkIncremental="1"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetPath) ..\..\..\Bin\x86-nt"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(TargetPath) ..\..\..\Bin\x86-nt"
+ />
</Configuration>
</Configurations>
<References>
@@ -125,33 +186,42 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ >
<File
- RelativePath=".\main.cpp">
+ RelativePath=".\main.cpp"
+ >
</File>
<File
- RelativePath="sock.c">
+ RelativePath="sock.c"
+ >
</File>
<File
- RelativePath=".\Utils.cpp">
+ RelativePath=".\Utils.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
+ Filter="h;hpp;hxx;hm;inl;inc"
+ >
<File
- RelativePath="sock.h">
+ RelativePath="sock.h"
+ >
</File>
<File
- RelativePath="sphinx-server.h">
+ RelativePath="sphinx-server.h"
+ >
</File>
<File
- RelativePath=".\Utils.h">
+ RelativePath=".\Utils.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: Agents/MultiDecoder/Audio_Server/Utils.cpp
===================================================================
--- Agents/MultiDecoder/Audio_Server/Utils.cpp 2007-08-08 21:27:02 UTC (rev 1880)
+++ Agents/MultiDecoder/Audio_Server/Utils.cpp 2007-08-08 21:30:25 UTC (rev 1881)
@@ -102,14 +102,14 @@
// D: make a string uppercase
string ToUpperCase(string sString) {
strcpy(szBuffer, sString.c_str());
- strupr(szBuffer);
+ _strupr(szBuffer);
return (string)szBuffer;
}
// D: makes a string lowercase
string ToLowerCase(string sString) {
strcpy(szBuffer, sString.c_str());
- strlwr(szBuffer);
+ _strlwr(szBuffer);
return (string)szBuffer;
}
Modified: Agents/MultiDecoder/Audio_Server/main.cpp
===================================================================
--- Agents/MultiDecoder/Audio_Server/main.cpp 2007-08-08 21:27:02 UTC (rev 1880)
+++ Agents/MultiDecoder/Audio_Server/main.cpp 2007-08-08 21:30:25 UTC (rev 1881)
@@ -619,13 +619,13 @@
hub_log_prefix = NULL;
}
if (Gal_GetObject(f, ":hub_logdir")) {
- hub_log_dir = strdup(Gal_GetString(f, ":hub_logdir"));
+ hub_log_dir = _strdup(Gal_GetString(f, ":hub_logdir"));
}
else
fprintf( stderr, "Can't find :hub_logdir\n");
if (Gal_GetObject(f, ":hub_log_prefix")) {
- hub_log_prefix = strdup(Gal_GetString(f, ":hub_log_prefix"));
+ hub_log_prefix = _strdup(Gal_GetString(f, ":hub_log_prefix"));
}
else
fprintf( stderr, "Can't find :hub_log_prefix\n");
Modified: Agents/MultiDecoder/Audio_Server/sock.c
===================================================================
--- Agents/MultiDecoder/Audio_Server/sock.c 2007-08-08 21:27:02 UTC (rev 1880)
+++ Agents/MultiDecoder/Audio_Server/sock.c 2007-08-08 21:30:25 UTC (rev 1881)
@@ -265,7 +265,7 @@
}
/* Connect to server */
- memset ((char *) &addr, sizeof(addr), 0);
+ memset ((char *) &addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
memcpy (&addr.sin_addr, hp->h_addr, hp->h_length);
addr.sin_port = htons((u_short) port);
More information about the Ravenclaw-developers
mailing list