cleanup our history a bit

src/engine/client/library/clientAudio/src/win32/Audio.cpp

@@ -40,7 +40,7 @@
 #include <list>
 #include <map>
 
-#if PRODUCTION == 0
+#if 0
 #include "clientAudio/SwgAudioCapture.h"
 #endif // PRODUCTION
 
@@ -5405,7 +5405,7 @@ void Audio::silenceNonBufferedMusic(bool silence)
 }
 
 //-----------------------------------------------------------------------------
-#if PRODUCTION == 0
+#if 0
 bool Audio::getAudioCaptureConfig(int& samplesPerSec, int& bitsPerSample, int& channels)
 {
 	if(!s_digitalDevice2d)
@@ -5426,7 +5426,7 @@ bool Audio::getAudioCaptureConfig(int& samplesPerSec, int& bitsPerSample, int& c
 #endif // PRODUCTION
 
 //-----------------------------------------------------------------------------
-#if PRODUCTION == 0
+#if 0
 bool Audio::startAudioCapture(AudioCapture::ICallback* pCallback)
 {
 	if(!s_audioFilterProvider)
@@ -5456,7 +5456,7 @@ bool Audio::startAudioCapture(AudioCapture::ICallback* pCallback)
 #endif // PRODUCTION
 
 //-----------------------------------------------------------------------------
-#if PRODUCTION == 0
+#if 0
 void Audio::stopAudioCapture()
 {
 	// NOTE: s_audioFilterProvider is just an index and need not be reset

src/engine/client/library/clientGame/src/shared/core/Game.cpp

@@ -151,7 +151,7 @@
 
 #include <cstdio>
 
-#if PRODUCTION == 0
+#if 0
 #include "clientGraphics/SwgVideoCapture.h"
 #endif // PRODUCTION
 
@@ -761,7 +761,7 @@ void Game::install(Application const application)
 		ms_application = application;
 
 
-#if PRODUCTION == 0
+#if 0
 		if ((application == A_particleEditor || application == A_animationEditor)
 			&& !ConfigFile::getKeyBool("ClientTools","loadHud",false)
 		)
@@ -851,7 +851,7 @@ void Game::install(Application const application)
 		else
 #endif // _DEBUG
 		{
-#if PRODUCTION == 0
+#if 0
 			if (application == A_particleEditor || application == A_animationEditor)
 			{
 				ExitChain::add(Game::cleanupScene, "Game::cleanupScene");
@@ -928,7 +928,7 @@ void Game::install(Application const application)
 				LookAtTransformModifier::setAllowLookAtTargetFunction(allowLookAtTarget);
 				CharacterLodManager::setManageLodCallback(manageCharacterLodCallback);
 
-#if PRODUCTION == 0
+#if 0
 				//-- Tell these classes how to get the current camera for debug purposes.
 				LookAtTransformModifier::setGetCameraFunction(Game::getConstCamera);
 				TargetPitchTransformModifier::setGetCameraFunction(Game::getConstCamera);
@@ -1003,7 +1003,7 @@ void Game::cleanupScene(void)
 
 void Game::quit()
 {
-#if PRODUCTION == 0
+#if 0
 	Graphics::pixSetMarker(L"Quit");
 	PixCounter::disable();
 #endif
@@ -1066,7 +1066,7 @@ void Game::runGameLoopOnce(bool presentToWindow, HWND hwnd, int width, int heigh
 	bool result;
 	float elapsedTime = 0.0f;
 
-#if PRODUCTION == 0
+#if 0
 	VTune::beginFrame();
 #endif
 
@@ -1101,7 +1101,7 @@ void Game::runGameLoopOnce(bool presentToWindow, HWND hwnd, int width, int heigh
 		ms_bytesAllocated[4] = MemoryManager::getCurrentNumberOfBytesAllocated();
 		sprintf(ms_bytesAllocatedBuffer, "BytesAllocated: %lu %lu %lu %lu %lu\n", ms_bytesAllocated[0], ms_bytesAllocated[1], ms_bytesAllocated[2], ms_bytesAllocated[3], ms_bytesAllocated[4]);
 
-#if PRODUCTION == 0
+#if 0
 		NP_PROFILER_NAMED_AUTO_BLOCK_TRANSFER(profilerMainLoop, "debug");
 		DebugMonitor::clearScreen();
 		DebugFlags::callReportRoutines();
@@ -1230,7 +1230,7 @@ void Game::runGameLoopOnce(bool presentToWindow, HWND hwnd, int width, int heigh
 				IGNORE_RETURN(Graphics::present());
 		}
 
-#if PRODUCTION == 0
+#if 0
 		// this is here to be consistent with the behavior when PIX is running, since the polling will happen when Graphics::present() is called
 		PixCounter::update();
 #endif
@@ -1432,7 +1432,7 @@ void Game::_setScene(Scene* newScene)
 		WARNING (ms_sceneId.empty (), ("Game::setScene with empty sceneId"));
 	}
 
-#if PRODUCTION == 0
+#if 0
 	// update the sceneId in the FileManifest (also done more specifically in groundscene to get buildout info)
 	// however, we get updates to a null string here to tell us that we are transitioning to a new scene
 	if (FileManifest::shouldUpdateManifest())
@@ -2676,7 +2676,7 @@ float Game::getRadarRange()
 
 Game::SceneType Game::getHudSceneType()
 {
-#if PRODUCTION == 0
+#if 0
 	if (ms_useSpaceHudOnly)
 	{
 		return ST_space;
@@ -3009,7 +3009,7 @@ std::string Game::calculateNonInstanceSceneId(std::string const & scene)
 
 // ---------------------------------------------------------------------
 
-#if PRODUCTION == 0
+#if 0
 void Game::videoCaptureConfig(int resolution, int seconds, int quality, const char* filename)
 {
 	VideoCapture::install(); // Installs SoeUtilMemoryAdapter on first call
@@ -3019,7 +3019,7 @@ void Game::videoCaptureConfig(int resolution, int seconds, int quality, const ch
 
 // ---------------------------------------------------------------------
 
-#if PRODUCTION == 0
+#if 0
 class VideoCaptureCallback : public VideoCapture::SingleUse::ICallback
 {
 public:
@@ -3054,7 +3054,7 @@ void Game::videoCaptureStart()
 
 // ---------------------------------------------------------------------
 
-#if PRODUCTION == 0
+#if 0
 void Game::videoCaptureStop()
 {
 	VideoCapture::SingleUse::stop();

src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj

@@ -53,8 +53,8 @@
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\..\..\lib\win32-x86\</OutDir>
-    <IntDir>.\debug\</IntDir>
+    <OutDir>.\..\..\..\..\..\..\compile\win32\dpvs\Debug\</OutDir>
+    <IntDir>.\..\..\..\..\..\..\compile\win32\dpvs\Debug\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -89,6 +89,7 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -96,7 +97,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\bin\win32-x86\dpvsd.dll</OutputFile>
+      <OutputFile>.\..\..\..\..\..\..\compile\win32\dpvs\Debug\dpvs.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\remotedebugger\lib\;..\hl\lib\win32-x86-msvc\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -104,7 +105,7 @@
       <GenerateMapFile>true</GenerateMapFile>
       <MapFileName>.\debug/dpvsd.map</MapFileName>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>.\..\..\lib\win32-x86/dpvsd.lib</ImportLibrary>
+      <ImportLibrary>.\..\..\..\..\..\..\compile\win32\dpvs\Debug\dpvs.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <Bscmake>
@@ -471,4 +472,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>