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:
24dd566
)
win32: don't install libcec to the system directory by default, and delete previous...
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Sat, 18 Feb 2012 02:18:03 +0000
(
03:18
+0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Sat, 18 Feb 2012 03:11:54 +0000
(
04:11
+0100)
project/libCEC.nsi
patch
|
blob
|
blame
|
history
diff --git
a/project/libCEC.nsi
b/project/libCEC.nsi
index bff402d882ca277d9e7823309380c8135fc7f52e..82a538c19958709409a677ec3dcf51aae0081123 100644
(file)
--- a/
project/libCEC.nsi
+++ b/
project/libCEC.nsi
@@
-59,6
+59,13
@@
Section "USB-CEC driver" SecDriver
RMDir "$1"
${EndIf}
RMDir "$1"
${EndIf}
+ ; Delete libcec.dll and libcec.x64.dll from the system directory
+ ; Let a seperate installer do this, when we need it
+ Delete "$SYSDIR\libcec.dll"
+ ${If} ${RunningX64}
+ Delete "$SYSDIR\libcec.x64.dll"
+ ${EndIf}
+
; Copy to the installation directory
SetOutPath "$INSTDIR"
File "..\AUTHORS"
; Copy to the installation directory
SetOutPath "$INSTDIR"
File "..\AUTHORS"
@@
-132,13
+139,6
@@
Section "libCEC" SecLibCec
; Copy the headers
SetOutPath "$INSTDIR\include"
File /r /x *.so "..\include\cec*.*"
; Copy the headers
SetOutPath "$INSTDIR\include"
File /r /x *.so "..\include\cec*.*"
-
- ; Copy libcec.dll and libcec.x64.dll to the system directory
- SetOutPath "$SYSDIR"
- File "..\build\libcec.dll"
- ${If} ${RunningX64}
- File /nonfatal "..\build\x64\libcec.x64.dll"
- ${EndIf}
SectionEnd
Section "CEC debug client" SecCecClient
SectionEnd
Section "CEC debug client" SecCecClient
@@
-212,6
+212,10
@@
Section "Uninstall"
Delete "$INSTDIR\x64\*.lib"
Delete "$INSTDIR\x64\*.exe"
Delete "$INSTDIR\README"
Delete "$INSTDIR\x64\*.lib"
Delete "$INSTDIR\x64\*.exe"
Delete "$INSTDIR\README"
+ Delete "$SYSDIR\libcec.dll"
+ ${If} ${RunningX64}
+ Delete "$SYSDIR\libcec.x64.dll"
+ ${EndIf}
; Uninstall the driver
ReadRegStr $1 HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" ""
; Uninstall the driver
ReadRegStr $1 HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" ""