{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1750651342, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"197cb57f879ecf0afd4f6fdce037d723", "commit": {"type":"commit", "time": 1444609658, "time_ofs": 480, "oid_tree": { "oid": "d7d67aebfd9893ef89e4eb98a64a73d333232471", "alias": []}, "oid":{ "oid": "b6147fd2e5c549b1ebaa28b8b389d36ff0201d1f", "alias": []}, "msg": "Fix shared library name for all platforms", "sig_commit": { "git_time": { "time": 1444609658, "offset": 480 }, "name": "Andy Green", "email": "andy.green@linaro.org", "md5": "4863edaebb4491aa6049a4d2d9c98c2c" }, "sig_author": { "git_time": { "time": 1430856128, "offset": -300 }, "name": "Roger A. Light", "email": "roger@atchoo.org", "md5": "1a8a49d00b4aaa7abf2e759f81906262" }}, "body": "Fix shared library name for all platforms\n\nThis is a further fix to f1b1254, building on 26fd0d2.\n\nTidy up the LWS_WITH_SHARED and LWS_WITH_STATIC options.\n" , "diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex cfb1416..2ffb827 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -435,23 +435,37 @@ source_group(\u0022Sources\u0022 FILES ${SOURCES})\n # Create the lib.\n #\n set(LWS_LIBRARIES)\n+\n if (LWS_WITH_STATIC)\n \tadd_library(websockets STATIC\n \t\t\t\t${HDR_PRIVATE}\n \t\t\t\t${HDR_PUBLIC}\n \t\t\t\t${SOURCES})\n \tlist(APPEND LWS_LIBRARIES websockets)\n+\n+\tif (WIN32)\n+\t\t# Windows uses the same .lib ending for static libraries and shared\n+\t\t# library linker files, so rename the static library.\n+\t\tset_target_properties(websockets\n+\t\t\tPROPERTIES\n+\t\t\tOUTPUT_NAME websockets_static)\n+\tendif()\n endif()\n+\n if (LWS_WITH_SHARED)\n \tadd_library(websockets_shared SHARED\n \t\t\t\t${HDR_PRIVATE}\n \t\t\t\t${HDR_PUBLIC}\n \t\t\t\t${SOURCES})\n \tlist(APPEND LWS_LIBRARIES websockets_shared)\n-endif()\n \n-if (WIN32)\n-\tif (LWS_WITH_SHARED)\n+\t# We want the shared lib to be named \u0022libwebsockets\u0022\n+\t# not \u0022libwebsocket_shared\u0022.\n+\tset_target_properties(websockets_shared\n+\t\tPROPERTIES\n+\t\tOUTPUT_NAME websockets)\n+\n+\tif (WIN32)\n \t\t# Compile as DLL (export function declarations)\n \t\tset_property(\n \t\t\tTARGET websockets_shared\n@@ -459,16 +473,13 @@ if (WIN32)\n \t\t\tLWS_DLL\n \t\t\tLWS_INTERNAL)\n \tendif()\n-elseif(APPLE)\n-\tif (LWS_WITH_SHARED)\n+\n+\tif (APPLE)\n \t\tset_property(TARGET websockets_shared PROPERTY MACOSX_RPATH YES)\n \tendif()\n-else()\n-\tset_target_properties(websockets_shared\n-\tPROPERTIES\n-\tOUTPUT_NAME websockets)\n endif()\n \n+\n # Set the so version of the lib.\n # Equivalent to LDFLAGS\u003d-version-info x:x:x\n if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)\ndiff --git a/win32port/libwebsockets.nsi b/win32port/libwebsockets.nsi\nindex a2de0ef..cfc66a3 100644\n--- a/win32port/libwebsockets.nsi\n+++ b/win32port/libwebsockets.nsi\n@@ -45,7 +45,7 @@ Section \u0022Files\u0022 SecInstall\n \tFile \u0022..\u005cbuild\u005cbin\u005cRelease\u005clibwebsockets-test-ping.exe\u0022\n \tFile /nonfatal \u0022..\u005cbuild\u005cbin\u005cRelease\u005clibwebsockets-test-server.exe\u0022\n \tFile /nonfatal \u0022..\u005cbuild\u005cbin\u005cRelease\u005clibwebsockets-test-server-extpoll.exe\u0022\n-\tFile \u0022..\u005cbuild\u005cbin\u005cRelease\u005cwebsockets_shared.dll\u0022\n+\tFile \u0022..\u005cbuild\u005cbin\u005cRelease\u005cwebsockets.dll\u0022\n \n \tSetOutPath \u0022$INSTDIR\u005clibwebsockets-test-server\u0022\n \tFile /nonfatal \u0022..\u005cbuild\u005cbin\u005cshare\u005clibwebsockets-test-server\u005cfavicon.ico\u0022\n@@ -56,8 +56,8 @@ Section \u0022Files\u0022 SecInstall\n \tFile /nonfatal \u0022..\u005cbuild\u005cbin\u005cshare\u005clibwebsockets-test-server\u005ctest.html\u0022\n \n \tSetOutPath \u0022$INSTDIR\u005clib\u0022\n-\tFile \u0022..\u005cbuild\u005clib\u005cRelease\u005cwebsockets_shared.lib\u0022\n \tFile \u0022..\u005cbuild\u005clib\u005cRelease\u005cwebsockets.lib\u0022\n+\tFile \u0022..\u005cbuild\u005clib\u005cRelease\u005cwebsockets_static.lib\u0022\n \n \tSetOutPath \u0022$INSTDIR\u005cinclude\u0022\n \tFile \u0022..\u005clib\u005clibwebsockets.h\u0022\n@@ -86,7 +86,7 @@ Section \u0022Uninstall\u0022\n \tDelete \u0022$INSTDIR\u005clibwebsockets-test-ping.exe\u0022\n \tDelete \u0022$INSTDIR\u005clibwebsockets-test-server.exe\u0022\n \tDelete \u0022$INSTDIR\u005clibwebsockets-test-server-extpoll.exe\u0022\n-\tDelete \u0022$INSTDIR\u005cwebsockets_shared.dll\u0022\n+\tDelete \u0022$INSTDIR\u005cwebsockets.dll\u0022\n \n \tDelete \u0022$INSTDIR\u005clibwebsockets-test-server\u005cfavicon.ico\u0022\n \tDelete \u0022$INSTDIR\u005clibwebsockets-test-server\u005cleaf.jpg\u0022\n@@ -96,8 +96,8 @@ Section \u0022Uninstall\u0022\n \tDelete \u0022$INSTDIR\u005clibwebsockets-test-server\u005ctest.html\u0022\n \tRMDir \u0022$INSTDIR\u005clibwebsockets-test-server\u0022\n \n-\tDelete \u0022$INSTDIR\u005clib\u005cwebsockets_shared.lib\u0022\n \tDelete \u0022$INSTDIR\u005clib\u005cwebsockets.lib\u0022\n+\tDelete \u0022$INSTDIR\u005clib\u005cwebsockets_static.lib\u0022\n \tRMDir \u0022$INSTDIR\u005clib\u0022\n \n \tDelete \u0022$INSTDIR\u005cinclude\u005clibwebsockets.h\u0022\n","s":{"c":1750607903,"u": 5376}} ],"g": 928,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "7d0a"}