repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
29b0e8d
)
don't check for the windows ddk when a prebuilt driver installer is present
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 29 Mar 2012 18:44:20 +0000
(20:44 +0200)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 29 Mar 2012 18:44:37 +0000
(20:44 +0200)
support/create-installer.bat
patch
|
blob
|
blame
|
history
diff --git
a/support/create-installer.bat
b/support/create-installer.bat
index 8c37a8f93a8317d4559782fb3bd64441c578c12c..eefd7db594f84f9205a1ae06ec58999d7ffcc0c0 100644
(file)
--- 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
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"
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 (
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
)
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
del /q /f ..\build\*.exp
del /s /f /q ..\build\x64
rmdir ..\build\x64
-cd ..\support
\ No newline at end of file
+cd ..\support
+