diff --git a/flake.nix b/flake.nix index ed8955c..6a874eb 100755 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,9 @@ Modules = { examples = import ./ExampleModules.nix { inherit inputs; inherit pkgs; }; - NetworkingModule = pkgs.stdenvNoCC.mkDerivation { + ServerModule = pkgs.stdenvNoCC.mkDerivation { - name = "NetworkingModule"; + name = "ServerModule"; src = ./.; @@ -41,12 +41,45 @@ buildPhase = '' clang++ \ - modules/NetworkingModule/src/*.cpp \ + modules/ServerModule/src/*.cpp \ -fpic -shared \ -I src -I include \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ - -DNETWORKINGMODULE_DYNAMIC \ + -DSERVERMODULE_DYNAMIC \ + -Wall \ + -o $name + ''; + + installPhase = '' + mkdir -p $out/bin + cp $name $out/bin + ''; + + }; + + ClientModule = pkgs.stdenvNoCC.mkDerivation { + + name = "ClientModule"; + + src = ./.; + + nativeBuildInputs = with pkgs; [ + clang + ]; + + buildInputs = with pkgs; [ + gamenetworkingsockets + ]; + + buildPhase = '' + clang++ \ + modules/ClientModule/src/*.cpp \ + -fpic -shared \ + -I src -I include \ + -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ + -lGameNetworkingSockets \ + -DCLIENTMODULE_DYNAMIC \ -Wall \ -o $name ''; diff --git a/modules/ClientModule/src/ClientModule.h b/modules/ClientModule/src/ClientModule.h index 86f3a5e..03f249a 100644 --- a/modules/ClientModule/src/ClientModule.h +++ b/modules/ClientModule/src/ClientModule.h @@ -11,9 +11,6 @@ class ClientModule : public Archimedes::Module { void onLoad(); void run(); - void startClient(std::string); - void startServer(unsigned int); - private: }; diff --git a/modules/ServerModule/src/ServerModule.h b/modules/ServerModule/src/ServerModule.h index 01bbbb3..094fa65 100644 --- a/modules/ServerModule/src/ServerModule.h +++ b/modules/ServerModule/src/ServerModule.h @@ -11,9 +11,6 @@ class ServerModule : public Archimedes::Module { void onLoad(); void run(); - void startClient(std::string); - void startServer(unsigned int); - private: };