From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 29 Mar 2012 18:44:20 +0000 (+0200)
Subject: don't check for the windows ddk when a prebuilt driver installer is present
X-Git-Tag: upstream/2.2.0~1^2~31^2~30
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=44f8f041839d490603fb40abb2b86807d2f9809d

don't check for the windows ddk when a prebuilt driver installer is present
---

diff --git a/support/create-installer.bat b/support/create-installer.bat
index 8c37a8f..eefd7db 100644
--- a/support/create-installer.bat
+++ b/support/create-installer.bat
@@ -7,10 +7,6 @@ IF EXIST "%ProgramFiles%\NSIS\makensis.exe" (
   set NSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
 ) ELSE GOTO NONSIS
 
-rem Check for the Windows DDK
-IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK
-set DDK="C:\WinDDK\7600.16385.1"
-
 rem Check for VC10
 IF "%VS100COMNTOOLS%"=="" (
   set COMPILER10="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe"
@@ -26,6 +22,10 @@ mkdir ..\build
 IF EXIST "..\support\p8-usbcec-driver-installer.exe" (
   copy "..\support\p8-usbcec-driver-installer.exe" "..\build\."
 ) ELSE (
+  rem Check for the Windows DDK
+  IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK
+  set DDK="C:\WinDDK\7600.16385.1"
+
   call create-driver-installer.cmd
 )
 
@@ -155,4 +155,5 @@ del /q /f ..\build\*.lib
 del /q /f ..\build\*.exp
 del /s /f /q ..\build\x64
 rmdir ..\build\x64
-cd ..\support
\ No newline at end of file
+cd ..\support
+