[TeamTalk 337]: [873] trunk/TeamTalk: 1) Moved from WIN32 to inherent _WIN32 in TeamTalkBackend and TeamTalkDM.

tk@edam.speech.cs.cmu.edu tk at edam.speech.cs.cmu.edu
Sun Nov 11 15:46:32 EST 2007 

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071111/cde4b4bf/attachment.html
-------------- next part --------------
Modified: trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj	2007-11-09 04:03:41 UTC (rev 872)
+++ trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj	2007-11-11 20:46:32 UTC (rev 873)
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""$(OLYMPUS_ROOT)\Libraries\Galaxy\include";"$(OLYMPUS_ROOT)\Libraries\Galaxy\contrib\MITRE\utilities\include";..\..\Libraries\PrimitiveComm;..\..\Libraries\boeingLib\boeing;..\..\Libraries\boeingLib\coralshared;"$(OLYMPUS_ROOT)\Agents\Pythia\PythiaDynamicClient""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(OLYMPUS_ROOT)\Libraries\Galaxy\include&quot;;&quot;$(OLYMPUS_ROOT)\Libraries\Galaxy\contrib\MITRE\utilities\include&quot;;..\..\Libraries\PrimitiveComm;..\..\Libraries\boeingLib\boeing;..\..\Libraries\boeingLib\coralshared;&quot;$(OLYMPUS_ROOT)\Agents\Pythia\PythiaDynamicClient&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				StructMemberAlignment="3"
 				RuntimeTypeInfo="true"

Modified: trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp	2007-11-09 04:03:41 UTC (rev 872)
+++ trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp	2007-11-11 20:46:32 UTC (rev 873)
@@ -1,6 +1,6 @@
 #include "agent.h"
 #include <utils.h>
-#ifdef WIN32
+#ifdef _WIN32
 #  include <win32dep.h>
 #endif
 

Modified: trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.vcproj
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.vcproj	2007-11-09 04:03:41 UTC (rev 872)
+++ trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.vcproj	2007-11-11 20:46:32 UTC (rev 873)
@@ -44,10 +44,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;&quot;$(OLYMPUS_ROOT)\Libraries\RavenClaw\DialogTask&quot;;&quot;$(OLYMPUS_ROOT)\Libraries\RavenClaw&quot;;&quot;$(OLYMPUS_ROOT)\Libraries\Galaxy\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;GALAXY"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;GALAXY"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				StructMemberAlignment="0"
 				BufferSecurityCheck="true"
 				EnableFunctionLevelLinking="true"
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib ws2_32.lib $(OLYMPUS_ROOT)\Libraries\Galaxy\lib\x86-nt\libGalaxy_debug.lib $(OLYMPUS_ROOT)\Libraries\Ravenclaw\Lib\DebugGalaxy\Ravenclaw.lib"
+				AdditionalDependencies="user32.lib ws2_32.lib $(OLYMPUS_ROOT)\Libraries\Galaxy\lib\x86-nt\libGalaxy_debug.lib $(OLYMPUS_ROOT)\Libraries\Ravenclaw\Lib\DebugGalaxy\Ravenclaw-DEBUG.lib"
 				OutputFile="$(OutDir)/TeamTalkDM.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -136,7 +136,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories=".;&quot;$(OLYMPUS_ROOT)\Libraries\RavenClaw\DialogTask&quot;;&quot;$(OLYMPUS_ROOT)\Libraries\RavenClaw&quot;;&quot;$(OLYMPUS_ROOT)\Libraries\Galaxy\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GALAXY"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;GALAXY"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				StructMemberAlignment="0"

Modified: trunk/TeamTalk/TeamTalk.sln
===================================================================
--- trunk/TeamTalk/TeamTalk.sln	2007-11-09 04:03:41 UTC (rev 872)
+++ trunk/TeamTalk/TeamTalk.sln	2007-11-11 20:46:32 UTC (rev 873)
@@ -17,41 +17,101 @@
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TeamTalk-Setup", "TeamTalk-Setup\TeamTalk-Setup.vdproj", "{0639F43D-780B-4C5E-97B1-CBE1362892BE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RavenClaw", "%OLYMPUS_ROOT%\Libraries\RavenClaw\RavenClaw.vcproj", "{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		DebugGalaxy|Win32 = DebugGalaxy|Win32
+		DebugOAA|Win32 = DebugOAA|Win32
 		Publish|Win32 = Publish|Win32
 		Release|Win32 = Release|Win32
+		ReleaseGalaxy|Win32 = ReleaseGalaxy|Win32
+		ReleaseOAA|Win32 = ReleaseOAA|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Debug|Win32.Build.0 = Debug|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.DebugGalaxy|Win32.Build.0 = Debug|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.DebugOAA|Win32.ActiveCfg = Debug|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.DebugOAA|Win32.Build.0 = Debug|Win32
 		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Publish|Win32.ActiveCfg = Release|Win32
 		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Publish|Win32.Build.0 = Release|Win32
 		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Release|Win32.ActiveCfg = Release|Win32
 		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Release|Win32.Build.0 = Release|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.ReleaseGalaxy|Win32.Build.0 = Release|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.ReleaseOAA|Win32.ActiveCfg = Release|Win32
+		{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.ReleaseOAA|Win32.Build.0 = Release|Win32
 		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.Debug|Win32.ActiveCfg = Debug|Win32
 		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.Debug|Win32.Build.0 = Debug|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.DebugGalaxy|Win32.Build.0 = Debug|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.DebugOAA|Win32.ActiveCfg = Debug|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.DebugOAA|Win32.Build.0 = Debug|Win32
 		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.Publish|Win32.ActiveCfg = Release|Win32
 		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.Publish|Win32.Build.0 = Release|Win32
 		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.Release|Win32.ActiveCfg = Release|Win32
 		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.Release|Win32.Build.0 = Release|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.ReleaseGalaxy|Win32.Build.0 = Release|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.ReleaseOAA|Win32.ActiveCfg = Release|Win32
+		{596C5D37-C409-4C46-BA28-B7F5EFB96851}.ReleaseOAA|Win32.Build.0 = Release|Win32
 		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.Build.0 = Debug|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugGalaxy|Win32.Build.0 = Debug|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugOAA|Win32.ActiveCfg = Debug|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugOAA|Win32.Build.0 = Debug|Win32
 		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.Publish|Win32.ActiveCfg = Release|Win32
 		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.Publish|Win32.Build.0 = Release|Win32
 		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.ActiveCfg = Release|Win32
 		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.Build.0 = Release|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseGalaxy|Win32.Build.0 = Release|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseOAA|Win32.ActiveCfg = Release|Win32
+		{8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseOAA|Win32.Build.0 = Release|Win32
 		{4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.Build.0 = Debug|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugGalaxy|Win32.Build.0 = Debug|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugOAA|Win32.ActiveCfg = Debug|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugOAA|Win32.Build.0 = Debug|Win32
 		{4051C912-8C55-442F-9AF8-3F3AE9859776}.Publish|Win32.ActiveCfg = Release|Win32
 		{4051C912-8C55-442F-9AF8-3F3AE9859776}.Publish|Win32.Build.0 = Release|Win32
 		{4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.ActiveCfg = Release|Win32
 		{4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.Build.0 = Release|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseGalaxy|Win32.Build.0 = Release|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseOAA|Win32.ActiveCfg = Release|Win32
+		{4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseOAA|Win32.Build.0 = Release|Win32
 		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.Debug|Win32.ActiveCfg = Debug
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.DebugGalaxy|Win32.ActiveCfg = Debug
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.DebugGalaxy|Win32.Build.0 = Debug
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.DebugOAA|Win32.ActiveCfg = Debug
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.DebugOAA|Win32.Build.0 = Debug
 		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.Publish|Win32.ActiveCfg = Release
 		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.Publish|Win32.Build.0 = Release
 		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.Release|Win32.ActiveCfg = Release
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.ReleaseGalaxy|Win32.ActiveCfg = Release
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.ReleaseGalaxy|Win32.Build.0 = Release
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.ReleaseOAA|Win32.ActiveCfg = Release
+		{0639F43D-780B-4C5E-97B1-CBE1362892BE}.ReleaseOAA|Win32.Build.0 = Release
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug|Win32.ActiveCfg = DebugOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug|Win32.Build.0 = DebugOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugGalaxy|Win32.ActiveCfg = DebugGalaxy|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugGalaxy|Win32.Build.0 = DebugGalaxy|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugOAA|Win32.ActiveCfg = DebugOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugOAA|Win32.Build.0 = DebugOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Publish|Win32.ActiveCfg = ReleaseOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Publish|Win32.Build.0 = ReleaseOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release|Win32.ActiveCfg = ReleaseOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release|Win32.Build.0 = ReleaseOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseGalaxy|Win32.ActiveCfg = ReleaseGalaxy|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseGalaxy|Win32.Build.0 = ReleaseGalaxy|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseOAA|Win32.ActiveCfg = ReleaseOAA|Win32
+		{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseOAA|Win32.Build.0 = ReleaseOAA|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/TeamTalk/TeamTalkRun.bat
===================================================================
--- trunk/TeamTalk/TeamTalkRun.bat	2007-11-09 04:03:41 UTC (rev 872)
+++ trunk/TeamTalk/TeamTalkRun.bat	2007-11-11 20:46:32 UTC (rev 873)
@@ -1,25 +1,33 @@
 @echo off
 
-:Check to make sure the file is not running with a wrong working directory
-title TeamTalk Lanucher for Win32
-IF NOT EXIST Configurations\DesktopConfiguration\startlist-desktop.config goto Error
-IF NOT EXIST Agents\Pythia\dist\process_monitor.exe goto Error
+TITLE TeamTalk Lanucher for Win32
 
-cd Configurations\DesktopConfiguration
-START ..\..\Agents\Pythia\dist\process_monitor.exe startlist-desktop.config
-cd ..\..
+REM Which configuration
+IF "%RunTimeConfig%"=="" SET RunTimeConfig=startlist-desktop
 
-:: Don't display the message that the script was run in the wrong working directory as that was not the case
+REM Check to make sure that OLYMPUS_ROOT is set.
+IF "%OLYMPUS_ROOT%"=="" goto ErrorNoOlympusEnv
+
+REM Check to make sure the file is not running with a wrong working directory
+IF NOT EXIST Configurations\DesktopConfiguration\%RunTimeConfig%.config goto ErrorWrongWorkingDirectory
+
+START /DConfigurations\DesktopConfiguration %OLYMPUS_ROOT%\Agents\Pythia\dist\process_monitor.exe %RunTimeConfig%.config
 goto End
 
-:Error message that says that the script was run outside of the TeamTalk directory.
-
+:ErrorWrongWorkingDirectory
 echo. 
-echo This script must be run with the current directory being that of the script.  
+echo This script must be run with the current directory being that of the script, in the root directory of TeamTalk.  
 echo (For example, click directly on the script in Windows Explorer instead of 
 echo entering the full path to the script at the command prompt.)
 echo.  
 echo If this is not the case, please contact bfrisch at gmail.com.
 echo.  
+pause
+goto End
 
-:End script execution
\ No newline at end of file
+:ErrorNoOlympusEnv
+echo Please set the OLYMPUS_ROOT environment variable.
+pause
+
+:End script execution
+SET RunTimeConfig=
\ No newline at end of file

Modified: trunk/TeamTalk/TeamTalkVirtRun.bat
===================================================================
--- trunk/TeamTalk/TeamTalkVirtRun.bat	2007-11-09 04:03:41 UTC (rev 872)
+++ trunk/TeamTalk/TeamTalkVirtRun.bat	2007-11-11 20:46:32 UTC (rev 873)
@@ -1,20 +1,14 @@
 @echo off
 
-:Check to make sure the file is not running with a wrong working directory
-title TeamTalk Lanucher for Win32
-IF NOT EXIST Configurations\DesktopConfiguration\startlist-virtual.config goto Error
-IF NOT EXIST Agents\Pythia\dist\process_monitor.exe goto Error
+SET RunTimeConfig=startlist-virtual
 
+REM Check to make sure the file is not running with a wrong working directory
+IF NOT EXIST Configurations\DesktopConfiguration\startlist-virtual.config goto ErrorWrongWorkingDirectory
+
 START AlwaysOnTop Unreal 0
-cd Configurations\DesktopConfiguration
-START ..\..\Agents\Pythia\dist\process_monitor.exe startlist-virtual.config
-cd ..\..
+TeamTalkRun.bat
 
-:: Don't display the message that the script was run in the wrong working directory as that was not the case
-goto End
-
-:Error message that says that the script was run outside of the TeamTalk directory.
-
+:ErrorWrongWorkingDirectory
 echo. 
 echo This script must be run with the current directory being that of the script.  
 echo (For example, click directly on the script in Windows Explorer instead of 
@@ -22,5 +16,3 @@
 echo.  
 echo If this is not the case, please contact bfrisch at gmail.com.
 echo.  
-
-:End script execution
\ No newline at end of file

More information about the TeamTalk-developers mailing list