Merge pull request #10 from Hakkadaikon/develop

develop -> main

Author: Hakkadaikon

README.md

@@ -7,23 +7,40 @@
 
 Websocket server that complies with RFC6455.(The WebSocket Protocol)  
 
-![icon](https://github.com/user-attachments/assets/f4b92376-17db-4979-897a-b005ed421e22)
+![icon](https://github.com/user-attachments/assets/7f02a1de-a4cf-456f-b833-30b2e1c440d1)
 
 # Usage  
 ## Build  
 
 ```shell  
-# release build
+# library build (host/release)
+# output : build/lib/
 cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
 cmake --build build
-make BUILD=release -C examples/echoback 
 
-# debug build
+# library build (host/debug)
+# output : build/lib/
 cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
 cmake --build build
-make BUILD=debug -C examples/echoback 
 
-# musl build (release) (x86/64 & linux only)
+
+# library build (nix/release)
+# output : result/lib/
+nix build
+
+# library build (nix/debug)
+# output : result/lib/
+nix build .#debug
+
+# sample build (debug)
+# LDLIB : build/lib/
+make BUILD=debug -C examples/echoback
+
+# sample build (release)
+# LDLIB : build/lib/
+make BUILD=release -C examples/echoback
+
+# musl build with example/echoback (release & x86/64 & linux only)
 ./shell/musl_build.sh
 ```
 

examples/echoback/Makefile

@@ -26,6 +26,7 @@ endif
 SRCROOT  := .
 OBJROOT  := ./obj
 BINROOT  := ./bin
+LDLIBS   := -L../../build/lib
 
 #------------------------------------------------------------------------------
 # Files
@@ -45,7 +46,6 @@ CFLAGS := \
 	-g \
 	-DLOG_LEVEL_DEBUG
 
-LDLIBS  := -L../../build/lib
 LDFLAGS := -lwsserver
 else
 CFLAGS := \
@@ -56,7 +56,6 @@ CFLAGS := \
 	-fPIC \
 	-DLOG_LEVEL_DEBUG
 
-LDLIBS  := -L../../build/lib
 LDFLAGS := -lwsserver
 endif
 
@@ -73,7 +72,6 @@ CFLAGS := \
 	-falign-functions \
 	-DLOG_LEVEL_ERROR
 
-LDLIBS  := -L../../build/lib
 LDFLAGS := -flto -lwsserver
 else
 CFLAGS := \
@@ -88,7 +86,6 @@ CFLAGS := \
 	-DLOG_LEVEL_ERROR
 endif
 
-LDLIBS  := -L../../build/lib
 LDFLAGS := -lwsserver -static
 endif
 endif
@@ -113,7 +110,6 @@ all:
 
 clean:
 	rm -f $(BINROOT)/$(PROGRAM)
-	rm -rf $(OBJROOT)/*
 	rm -rf $(DEPENDFILES)
 
 ifneq "$(MAKECMDGOALS)" "clean"

flake.lock

@@ -0,0 +1,74 @@
+{
+  description = "wsserver flake: build a WebSocket server library with CMake";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+
+        wsserverRelease = pkgs.stdenv.mkDerivation {
+          pname = "wsserver-release";
+          version = "2.1.3";
+          src = self;
+          nativeBuildInputs = [ pkgs.cmake pkgs.gnumake ];
+
+          buildPhase = ''
+            cd $TMPDIR
+            cmake -S $src -B build -DCMAKE_BUILD_TYPE=Release
+            cmake --build build
+          '';
+
+          installPhase = ''
+            mkdir -p $out/lib/ $out/include/
+            cp $TMPDIR/build/lib/libwsserver.a $out/lib/
+            cp $src/src/websocket/websocket.h $out/include/
+          '';
+
+          meta = with pkgs.lib; {
+            description = "WebSocket server library";
+            license = licenses.mit;
+            platforms = platforms.linux;
+          };
+        };
+
+        wsserverDebug = pkgs.stdenv.mkDerivation {
+          pname = "wsserver-debug";
+          version = "2.1.3";
+          src = self;
+          nativeBuildInputs = [ pkgs.cmake pkgs.gnumake ];
+
+          buildPhase = ''
+            cd $TMPDIR
+            cmake -S $src -B build -DCMAKE_BUILD_TYPE=Debug
+            cmake --build build
+          '';
+
+          installPhase = ''
+            mkdir -p $out/lib/ $out/include/
+            cp $TMPDIR/build/lib/libwsserver.a $out/lib/
+            cp $src/src/websocket/websocket.h $out/include/
+          '';
+
+          meta = with pkgs.lib; {
+            description = "WebSocket server library (debug)";
+            license = licenses.mit;
+            platforms = platforms.linux;
+          };
+        };
+      in {
+        packages.release = wsserverRelease;
+        packages.debug = wsserverDebug;
+        packages.default = wsserverRelease;
+
+        devShell = pkgs.mkShell {
+          buildInputs = [ pkgs.cmake pkgs.gnumake ];
+        };
+      }
+    );
+}
+