2.1.0: Improved <windows.h> include for lower build-time and more consistent string...

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

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 88fcb42e66b0d1a5c0723eb43889e505a30e58fb..3120fad65cc46d8bd66e00e73fc2170eba10d7f2 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -132,6 +132,7 @@
     <ClInclude Include="os\windows\current_version.h" />\r
     <ClInclude Include="os\windows\system_info.h" />\r
     <ClInclude Include="enum_class.h" />\r
+    <ClInclude Include="os\windows\windows.h" />\r
     <ClInclude Include="stdafx.h" />\r
     <ClInclude Include="utf.h" />\r
     <ClInclude Include="prec_timer.h" />\r

diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index e65787bc914f593fccb5ee7aef32c37d226d4a21..10a5775739c499ac9907a88137283ce56541f30e 100644 (file)
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -136,5 +136,8 @@
     <ClInclude Include="assert.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="os\windows\windows.h">\r
+      <Filter>source\os\windows</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/common/exception/win32_exception.cpp b/common/exception/win32_exception.cpp
index af58021a2996466b4e2307a1950880ac0e3c9c83..566c35acaee4e0b6c58eed2fc75ddd6146ee04d9 100644 (file)
--- a/common/exception/win32_exception.cpp
+++ b/common/exception/win32_exception.cpp
@@ -23,7 +23,7 @@
 \r
 #include "win32_exception.h"\r
 \r
-#include <windows.h>\r
+#include "../os/windows/windows.h"\r
 \r
 namespace caspar {\r
 \r

diff --git a/common/os/windows/current_version.h b/common/os/windows/current_version.h
index 174bffa0aaa9fbb9dc4dd3d814d6991301e9b1c6..cbd5bfaee94d57a9b09a98fc96c7be312f89236d 100644 (file)
--- a/common/os/windows/current_version.h
+++ b/common/os/windows/current_version.h
@@ -24,7 +24,7 @@
 #define NOMINMAX\r
 #define WIN32_LEAN_AND_MEAN\r
 \r
-#include <windows.h>\r
+#include "windows.h"\r
 \r
 #include <string>\r
 \r

diff --git a/common/os/windows/system_info.h b/common/os/windows/system_info.h
index a6d58eb4577b9dabcec5494208d466cbb8a3cf4a..06ff07a0bdd70878df495530a0f41f3fafc92fa7 100644 (file)
--- a/common/os/windows/system_info.h
+++ b/common/os/windows/system_info.h
@@ -21,10 +21,7 @@
 \r
 #pragma once\r
 \r
-#define NOMINMAX\r
-#define WIN32_LEAN_AND_MEAN\r
-\r
-#include <windows.h>\r
+#include "windows.h"\r
 \r
 #include <string>\r
 #include <sstream>\r

diff --git a/common/os/windows/windows.h b/common/os/windows/windows.h
new file mode 100644 (file)
index 0000000..b1afff9
--- /dev/null
+++ b/common/os/windows/windows.h
@@ -0,0 +1,26 @@
+#pragma once\r
+\r
+#undef _UNICODE\r
+#define _UNICODE\r
+#undef UNICODE\r
+#define UNICODE\r
+\r
+#undef NOMINMAX\r
+#define NOMINMAX\r
+\r
+#undef NOSERVICE\r
+#define NOSERVICE\r
+#undef NOMCX\r
+#define NOMCX\r
+\r
+#ifdef _MSC_VER\r
+#      include <SDKDDKVer.h>\r
+#endif\r
+#ifndef _WIN32_WINNT\r
+#define _WIN32_WINNT _WIN32_WINNT_WIN7\r
+#endif\r
+\r
+#undef WIN32_LEAN_AND_MEAN\r
+#define WIN32_LEAN_AND_MEAN\r
+\r
+#include <windows.h>
\ No newline at end of file

diff --git a/common/prec_timer.cpp b/common/prec_timer.cpp
index 65f61ba11d8f62fc1794eb2d356f0d655a24f183..1e4e8eb86b1c7f784c855221c1752ca03221edf9 100644 (file)
--- a/common/prec_timer.cpp
+++ b/common/prec_timer.cpp
@@ -23,9 +23,8 @@
 \r
 #include "prec_timer.h"\r
 \r
-#define NOMINMAX\r
+#include "os/windows/windows.h"\r
 \r
-#include <windows.h>\r
 #include <Mmsystem.h>\r
 \r
 namespace caspar {\r

diff --git a/common/stdafx.h b/common/stdafx.h
index 1c31d8b8f4fb1422e519eda05b0b2acf846b596d..11a6c3c9f703419e89efa7065846c59e108bb395 100644 (file)
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -21,7 +21,4 @@
 \r
 #pragma once\r
 \r
-#define NOMINMAX\r
-#define WIN32_LEAN_AND_MEAN\r
-\r
-#include <windows.h>
\ No newline at end of file
+#include "os/windows/windows.h"
\ No newline at end of file

diff --git a/shell/casparcg.config b/shell/casparcg.config
index adfbec30cf0e0983a00b3af8ffa0733ccd3d07e8..825bc062c6ac346b022ef83cb7624493f110097a 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>M:\caspar\_media\</media-path>\r
-    <log-path>M:\caspar\_log\</log-path>\r
-    <data-path>M:\caspar\_data\</data-path>\r
-    <template-path>M:\caspar\_templates\</template-path>\r
+    <media-path>D:\casparcg\_media\</media-path>\r
+    <log-path>D:\casparcgr\_log\</log-path>\r
+    <data-path>D:\casparcg\_data\</data-path>\r
+    <template-path>D:\casparcg\_templates\</template-path>\r
   </paths>\r
   <log-level>trace</log-level>\r
   <channel-grid>true</channel-grid>\r
@@ -12,9 +12,16 @@
     <channel>\r
       <video-mode>720p5000</video-mode>\r
       <consumers>\r
-        <screen>\r
-          <device>1</device>\r
-        </screen>\r
+      </consumers>\r
+    </channel>\r
+    <channel>\r
+      <video-mode>720p5000</video-mode>\r
+      <consumers>\r
+      </consumers>\r
+    </channel>\r
+    <channel>\r
+      <video-mode>720p5000</video-mode>\r
+      <consumers>\r
       </consumers>\r
     </channel>\r
   </channels>\r

diff --git a/shell/main.cpp b/shell/main.cpp
index 5c4a72dc450432635f891f7933f723b53b95fd9d..5d854b95d9a19432488ee5d48274da68ffeb0433 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -37,7 +37,7 @@
 \r
 #include "server.h"\r
 \r
-#include <windows.h>\r
+#include <common/os/windows/windows.h>\r
 #include <winnt.h>\r
 #include <mmsystem.h>\r
 #include <atlbase.h>\r