Structural changes and minor fix for compiling in debug mode.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@660 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/memory/memclr.h b/common/memory/memclr.h
index 19f7ff29b0ae534ac479b5f871eb422a5803e13f..76a3bf368513ddfea4308aa728f8742987b7cf20 100644 (file)
--- a/common/memory/memclr.h
+++ b/common/memory/memclr.h
@@ -27,7 +27,6 @@ static void* fast_memclr(void* dest, size_t count)
 {\r
        assert(count % 128 == 0);\r
        assert(dest != nullptr);\r
-       assert(source != nullptr);\r
 \r
        __asm   \r
        {              \r

diff --git a/shell/main.cpp b/shell/main.cpp
index 570aed3fae4dc169f4df3fbf9aad523416ac268c..f95cfb6fa00660db665289fe0177987af684ca35 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -17,11 +17,15 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
 *\r
 */\r
-\r
 #include "resource.h"\r
 \r
 #include "server.h"\r
 \r
+// tbbmalloc_proxy: \r
+// Replace the standard memory allocation routines in Microsoft* C/C++ RTL \r
+// (malloc/free, global new/delete, etc.) with the TBB memory allocator. \r
+#include <tbb/tbbmalloc_proxy.h>\r
+\r
 #ifdef _DEBUG\r
        #define _CRTDBG_MAP_ALLOC\r
        #include <stdlib.h>\r
@@ -31,15 +35,14 @@
 #define NOMINMAX\r
 \r
 #include <windows.h>\r
+#include <atlbase.h>\r
 #include <conio.h>\r
 \r
-// tbbmalloc_proxy: \r
-// Replace the standard memory allocation routines in Microsoft* C/C++ RTL \r
-// (malloc/free, global new/delete, etc.) with the TBB memory allocator. \r
-#include <tbb/tbbmalloc_proxy.h>\r
+#include <mixer/gpu/ogl_device.h>\r
 \r
-#include <modules/bluefish/bluefish.h>\r
+#include <protocol/amcp/AMCPProtocolStrategy.h>\r
 \r
+#include <modules/bluefish/bluefish.h>\r
 #include <modules/decklink/decklink.h>\r
 #include <modules/flash/flash.h>\r
 #include <modules/ffmpeg/ffmpeg.h>\r
@@ -53,19 +56,13 @@
 #include <common/os/windows/system_info.h>\r
 #include <common/utility/assert.h>\r
 \r
-#include <mixer/gpu/ogl_device.h>\r
-\r
-#include <protocol/amcp/AMCPProtocolStrategy.h>\r
+#include <Glee.h>\r
 \r
 #include <tbb/task_scheduler_observer.h>\r
 #include <tbb/task_scheduler_init.h>\r
 \r
 #include <boost/foreach.hpp>\r
 \r
-#include <Glee.h>\r
-\r
-#include <atlbase.h>\r
-\r
 // NOTE: This is needed in order to make CComObject work since this is not a real ATL project.\r
 CComModule _AtlModule;\r
 extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;\r
@@ -162,7 +159,7 @@ int main(int argc, wchar_t* argv[])
                caspar::env::configure("caspar.config");\r
 \r
        #ifdef _DEBUG\r
-               if(env::properties().get("configuration.debugging.remote", false))\r
+               if(caspar::env::properties().get("configuration.debugging.remote", false))\r
                        MessageBox(nullptr, TEXT("Now is the time to connect for remote debugging..."), TEXT("Debug"), MB_OK | MB_TOPMOST);\r
        #endif   \r
 \r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index e19dc19704ed76051ccb9dc9c25a2d44971f6e56..d9376b001c3f2afdad2026b33f1b08865d0e6800 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -203,7 +203,7 @@
       <MapExports>false</MapExports>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy $(SolutionDir)\dlls\*.dll $(OutDir)\</Command>\r
+      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -257,7 +257,7 @@
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy $(SolutionDir)\dlls\*.dll $(OutDir)\</Command>\r
+      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">\r
@@ -311,7 +311,7 @@
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy $(SolutionDir)\dlls\*.dll $(OutDir)\</Command>\r
+      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">\r
@@ -365,7 +365,7 @@
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy $(SolutionDir)\dlls\*.dll $(OutDir)\</Command>\r
+      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r