Merge pull request #3 from Microsoft/develop

bobbrow · bobbrow · commit 86b7ce21a735 · 2015-07-29T13:29:25.000-07:00
Develop
diff --git a/Samples/D3D1211On12/src/D3D1211On12.cpp b/Samples/D3D1211On12/src/D3D1211On12.cpp
@@ -224,7 +224,7 @@ void D3D1211on12::LoadAssets()
 		ComPtr<ID3DBlob> vertexShader;
 		ComPtr<ID3DBlob> pixelShader;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
diff --git a/Samples/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.cpp b/Samples/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.cpp
@@ -211,7 +211,7 @@ void D3D12ExecuteIndirect::LoadAssets()
 		ComPtr<ID3DBlob> computeShader;
 		ComPtr<ID3DBlob> error;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
diff --git a/Samples/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.cpp b/Samples/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.cpp
@@ -148,7 +148,7 @@ void D3D12HelloBundles::LoadAssets()
 		ComPtr<ID3DBlob> vertexShader;
 		ComPtr<ID3DBlob> pixelShader;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
diff --git a/Samples/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.cpp b/Samples/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.cpp
@@ -172,7 +172,7 @@ void D3D12HelloConstBuffers::LoadAssets()
 		ComPtr<ID3DBlob> vertexShader;
 		ComPtr<ID3DBlob> pixelShader;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
diff --git a/Samples/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.cpp b/Samples/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.cpp
@@ -147,7 +147,7 @@ void D3D12HelloTriangle::LoadAssets()
 		ComPtr<ID3DBlob> vertexShader;
 		ComPtr<ID3DBlob> pixelShader;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
diff --git a/Samples/D3D12Multithreading/src/D3D12Multithreading.cpp b/Samples/D3D12Multithreading/src/D3D12Multithreading.cpp
@@ -195,7 +195,7 @@ void D3D12Multithreading::LoadAssets()
 		ComPtr<ID3DBlob> vertexShader;
 		ComPtr<ID3DBlob> pixelShader;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
diff --git a/Samples/D3D12PredicationQueries/src/D3D12PredicationQueries.cpp b/Samples/D3D12PredicationQueries/src/D3D12PredicationQueries.cpp
@@ -185,7 +185,7 @@ void D3D12PredicationQueries::LoadAssets()
 		ComPtr<ID3DBlob> vertexShader;
 		ComPtr<ID3DBlob> pixelShader;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
diff --git a/Samples/D3D12nBodyGravity/src/D3D12nBodyGravity.cpp b/Samples/D3D12nBodyGravity/src/D3D12nBodyGravity.cpp
@@ -212,7 +212,7 @@ void D3D12nBodyGravity::LoadAssets()
 		ComPtr<ID3DBlob> pixelShader;
 		ComPtr<ID3DBlob> computeShader;
 
-#if DEBUG
+#ifdef _DEBUG
 		// Enable better shader debugging with the graphics debugging tools.
 		UINT compileFlags = D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #else
