diff options
| author | wonder-mice <wonder.mice@gmail.com> | 2015-04-22 10:52:13 -0700 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2015-04-24 07:27:18 +0800 |
| commit | f1b125442be619c43bff45791a3f6fd5726099b5 (patch) | |
| tree | b72b38610aca15de0a1b5ece423ce954debbfc01 /win32port | |
| parent | 644fea11c553811e8231b429b8c820a18b5c4094 (diff) | |
| download | libwebsockets-f1b125442be619c43bff45791a3f6fd5726099b5.tar.gz | |
Subject: [PATCH] Multiple changes in the build process
* Default CMAKE_BUILD_TYPE to Release
* Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though,
but cmake defines it)
* Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that)
* Drop LWS_NO_EXTERNAL_POLL (was not used)
* Drop CMAKE_BUILD (CMake is the only build system now)
* Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to
build
* Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library
dependency (zlib, openssl, libev, cyassl)
* Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS
by parent project (when included with add_subdirectory())
* Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to
NO (since it's Windows only)
* Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know
how to do it anyway)
* Rename config.h.cmake to lws_config.h.in
* Rename shared library to websockets_shared so linker will not be
confused
* Fix inline keyword detection in clang
* Explicitly set MACOSX_RPATH to YES on MacOS
Diffstat (limited to 'win32port')
| -rw-r--r-- | win32port/libwebsockets.nsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32port/libwebsockets.nsi b/win32port/libwebsockets.nsi index cfc66a39..a2de0ef9 100644 --- a/win32port/libwebsockets.nsi +++ b/win32port/libwebsockets.nsi @@ -45,7 +45,7 @@ Section "Files" SecInstall File "..\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 "..\build\bin\Release\websockets_shared.dll" SetOutPath "$INSTDIR\libwebsockets-test-server" File /nonfatal "..\build\bin\share\libwebsockets-test-server\favicon.ico" @@ -56,8 +56,8 @@ Section "Files" SecInstall File /nonfatal "..\build\bin\share\libwebsockets-test-server\test.html" SetOutPath "$INSTDIR\lib" + File "..\build\lib\Release\websockets_shared.lib" File "..\build\lib\Release\websockets.lib" - File "..\build\lib\Release\websockets_static.lib" SetOutPath "$INSTDIR\include" File "..\lib\libwebsockets.h" @@ -86,7 +86,7 @@ Section "Uninstall" Delete "$INSTDIR\libwebsockets-test-ping.exe" Delete "$INSTDIR\libwebsockets-test-server.exe" Delete "$INSTDIR\libwebsockets-test-server-extpoll.exe" - Delete "$INSTDIR\websockets.dll" + Delete "$INSTDIR\websockets_shared.dll" Delete "$INSTDIR\libwebsockets-test-server\favicon.ico" Delete "$INSTDIR\libwebsockets-test-server\leaf.jpg" @@ -96,8 +96,8 @@ Section "Uninstall" Delete "$INSTDIR\libwebsockets-test-server\test.html" RMDir "$INSTDIR\libwebsockets-test-server" + Delete "$INSTDIR\lib\websockets_shared.lib" Delete "$INSTDIR\lib\websockets.lib" - Delete "$INSTDIR\lib\websockets_static.lib" RMDir "$INSTDIR\lib" Delete "$INSTDIR\include\libwebsockets.h" |