projects / platform / upstream / libwebsockets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6f1e884)
Fix windows build errors
author=?UTF-8?q?Joakim=20S=C3=B6derberg?= <joakim.soderberg@gmail.com>
Mon, 8 Jun 2015 12:42:13 +0000 (14:42 +0200)
committerAndy Green <andy.green@linaro.org>
Mon, 12 Oct 2015 01:33:44 +0000 (09:33 +0800)
NSI installer errors causing failed windows builds

win32port/libwebsockets.nsi patch | blob | history

diff --git a/win32port/libwebsockets.nsi b/win32port/libwebsockets.nsi
index cfc66a3..f701265 100644 (file)
--- a/win32port/libwebsockets.nsi
+++ b/win32port/libwebsockets.nsi
@@ -39,13 +39,14 @@ Section "Files" SecInstall
        File "..\README.build.md"
        File "..\README.coding.md"
        File "..\README.test-apps.md"
-       File "..\build\bin\Release\libwebsockets-test-client.exe"
-       File "..\build\bin\Release\libwebsockets-test-echo.exe"
-       File "..\build\bin\Release\libwebsockets-test-fraggle.exe"
-       File "..\build\bin\Release\libwebsockets-test-ping.exe"
+       File /nonfatal "..\build\bin\Release\libwebsockets-test-client.exe"
+       File /nonfatal "..\build\bin\Release\libwebsockets-test-echo.exe"
+       File /nonfatal "..\build\bin\Release\libwebsockets-test-fraggle.exe"
+       File /nonfatal "..\build\bin\Release\libwebsockets-test-ping.exe"
        File /nonfatal "..\build\bin\Release\libwebsockets-test-server.exe"
        File /nonfatal "..\build\bin\Release\libwebsockets-test-server-extpoll.exe"
-       File "..\build\bin\Release\websockets.dll"
+       File /nonfatal "..\build\bin\Release\websockets.dll"
+       File /nonfatal "..\build\bin\Release\websockets_shared.dll"
 
        SetOutPath "$INSTDIR\libwebsockets-test-server"
        File /nonfatal "..\build\bin\share\libwebsockets-test-server\favicon.ico"
@@ -56,8 +57,10 @@ Section "Files" SecInstall
        File /nonfatal "..\build\bin\share\libwebsockets-test-server\test.html"
 
        SetOutPath "$INSTDIR\lib"
-       File "..\build\lib\Release\websockets.lib"
-       File "..\build\lib\Release\websockets_static.lib"
+       File /nonfatal "..\build\lib\Release\websockets.lib"
+       File /nonfatal "..\build\lib\Release\websockets_static.lib"
+       File /nonfatal "..\build\lib\Release\websockets_shared.lib"
+       File /nonfatal "..\build\lib\Release\websockets.lib"
 
        SetOutPath "$INSTDIR\include"
        File "..\lib\libwebsockets.h"
Domain: Network & Connectivity / Data Network;