build: Don't use QuickTime SDK when compiling Windows engine

peter-b · peter-b · commit 22e7497a6dc2 · 2016-06-30T10:45:56.000+01:00
In LiveCode 8.1, the engine no longer uses QuickTime, so it's not
necessary to use the SDK when compiling.  This ensures that
QuickTime's bogus not-compatible C headers aren't incorrectly used
when compiling the engine.

QuickTime is still needed for compiling the revVideoGrabber external,
and that's left unchanged.
diff --git a/engine/kernel-server.gyp b/engine/kernel-server.gyp
@@ -98,15 +98,6 @@
 	                    ],
 					},
 				],
-				[
-					'OS == "win"',
-					{
-						'include_dirs':
-						[
-							'<(quicktime_sdk)/CIncludes',
-						],
-					},
-				],
 				[
 					'mobile != 0',
 					{
@@ -158,11 +149,6 @@
 					[
 						'OS == "win"',
 						{
-							'library_dirs':
-							[
-								'<(quicktime_sdk)/Libraries',
-							],
-							
 							'libraries':
 							[
 								'-ladvapi32',
@@ -184,9 +170,6 @@
 								'-lwinmm',
 								'-lwinspool',
 								'-lws2_32',
-								
-								'-lQTMLClient',
-								'-lQTVR',
 							],
 						},
 					],
diff --git a/engine/kernel.gyp b/engine/kernel.gyp
@@ -91,15 +91,6 @@
 						},
 					},
 				],
-				[
-					'OS == "win"',
-					{
-						'include_dirs':
-						[
-							'<(quicktime_sdk)/CIncludes',
-						],
-					},
-				],
 				[
 					'OS == "emscripten"',
 					{
@@ -241,11 +232,6 @@
 					[
 						'OS == "win"',
 						{
-							'library_dirs':
-							[
-								'<(quicktime_sdk)/Libraries',
-							],
-							
 							'libraries':
 							[
 								'-ladvapi32',
@@ -268,9 +254,6 @@
 								'-lwinmm',
 								'-lwinspool',
 								'-lws2_32',
-								
-								'-lQTMLClient',
-								'-lQTVR',
 							],
 						},
 					],
diff --git a/engine/src/quicktime.cpp b/engine/src/quicktime.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 LiveCode Ltd.
+/* Copyright (C) 2003-2016 LiveCode Ltd.
  
  This file is part of LiveCode.
  
@@ -21,13 +21,18 @@
 #include "objdefs.h"
 #include "parsedef.h"
 
+#include "osspec.h"
+#include "variable.h"
+
+/* Pretty much everything in this file is only needed if quicktime
+ * effects are enabled. */
+#if defined(FEATURE_QUICKTIME_EFFECTS)
+
 #include "graphics.h"
 #include "stack.h"
 
 #include "player.h"
 #include "util.h"
-#include "osspec.h"
-#include "variable.h"
 
 #ifdef _WINDOWS_DESKTOP
 #include "w32prefix.h"
@@ -80,8 +85,6 @@ void UnlockPixels(PixMapHandle pix);
 
 #endif
 
-#ifdef FEATURE_QUICKTIME_EFFECTS
-
 ////////////////////////////////////////////////////////////////////////////////
 
 typedef struct
@@ -1262,5 +1265,5 @@ void MCQTGetVersion(MCStringRef& r_version)
 }
 
 
-#endif
+#endif /* !FEATURE_QUICKTIME_EFFECTS */
 
