diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f0416c9..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "vendor/spdlog"] - path = vendor/spdlog - url = https://github.com/gabime/spdlog -[submodule "vendor/bakatools"] - path = vendor/bakatools - url = https://github.com/anulax1225/bakatools diff --git a/bakanet/premake5.lua b/bakanet/premake5.lua deleted file mode 100755 index 7f30eed..0000000 --- a/bakanet/premake5.lua +++ /dev/null @@ -1,82 +0,0 @@ -project "bakanet" - kind "StaticLib" - language "C++" - cppdialect "C++20" - systemversion "latest" - staticruntime "on" - - targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") - objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") - - defines - { - "BKMOD_ALL" - } - - includedirs - { - "%{IncludeDirs.spdlog}", - "%{IncludeDirs.bakanet}", - "%{IncludeDirs.bakatools}" - } - - files - { - "%{prj.location}/src/bakanet/**.h", - "%{prj.location}/src/bakanet/**.cpp", - "%{prj.location}/src/baknetpch.h", - } - - links - { - "bakatools" - } - - filter "system:windows" - buildoptions "/MDd" - defines - { - "BK_PLATFORM_WINDOWS" - } - - files - { - "%{prj.location}/src/platform/windows/**.h", - "%{prj.location}/src/platform/windows/**.cpp", - } - - links - { - "WS2_32.lib" - } - - filter "system:linux" - defines - { - "BK_PLATFORM_LINUX" - } - - files - { - "%{prj.location}/src/platform/linux/**.h", - "%{prj.location}/src/platform/linux/**.cpp", - } - - filter "configurations:Debug" - defines - { - "BK_DEBUG", - "DEBUG" - } - runtime "Debug" - symbols "on" - - - filter "configurations:Release" - defines - { - "BK_RELEASE", - "NDEBUG" - } - runtime "Release" - optimize "on" \ No newline at end of file diff --git a/build b/build deleted file mode 100755 index 4faefdd..0000000 --- a/build +++ /dev/null @@ -1,23 +0,0 @@ - - -handle_error() { - echo "An error occurred on line $1" - exit 1 -} -trap 'handle_error $LINENO' ERR - -if [ "-clear" == "$1" ]; then - rm -rf bin bin-int -fi - -if [ "-clear" == "$2" ]; then - rm -rf bin bin-int -fi - -clear -premake5 gmake2 -make - -if [ "-exec" == "$1" ]; then - ./bin/linux-x86_64-Debug/server/server -fi \ No newline at end of file diff --git a/config.json b/config.json new file mode 100644 index 0000000..dc0bece --- /dev/null +++ b/config.json @@ -0,0 +1,12 @@ +{ + "name": "Bakanet", + "owner": "Anulax", + "git": "https://github.com/anulax1225/bakanet", + "packages": + [ + { + "author": "anulax1225", + "name": "bakatools" + } + ] +} \ No newline at end of file diff --git a/dependencies b/dependencies new file mode 100644 index 0000000..c4ef1cb --- /dev/null +++ b/dependencies @@ -0,0 +1,5 @@ +IncludeDirs["bakanet"] = "%{wks.location}/vendor/bakanet/src/" + +group "Bakanet" + include "vendor/bakanet" +group "" diff --git a/linker b/linker new file mode 100644 index 0000000..8617432 --- /dev/null +++ b/linker @@ -0,0 +1,9 @@ +includedirs +{ + "%{IncludeDirs.bakanet}" +} + +links +{ + "bakanet" +} \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index 2740937..7f30eed 100755 --- a/premake5.lua +++ b/premake5.lua @@ -1,27 +1,82 @@ -workspace "BakaraNet" - architecture "x64" - configurations { "Debug", "Release" } - startproject "server" - flags - { - "MultiProcessorCompile" - } - -outputdir = "%{cfg.system}-%{cfg.architecture}-%{cfg.buildcfg}" - -IncludeDirs = {} -IncludeDirs["bakanet"] = "%{wks.location}/bakanet/src/" -IncludeDirs["bakatools"] = "%{wks.location}/vendor/bakatools/src/" -IncludeDirs["spdlog"] = "%{wks.location}/vendor/spdlog/include" - -group "BakaModules" - include "vendor/bakatools" -group "" - -group "NetCore" - include "bakanet" -group "" - -group "Sandbox" - include "sandbox" -group "" \ No newline at end of file +project "bakanet" + kind "StaticLib" + language "C++" + cppdialect "C++20" + systemversion "latest" + staticruntime "on" + + targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") + objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") + + defines + { + "BKMOD_ALL" + } + + includedirs + { + "%{IncludeDirs.spdlog}", + "%{IncludeDirs.bakanet}", + "%{IncludeDirs.bakatools}" + } + + files + { + "%{prj.location}/src/bakanet/**.h", + "%{prj.location}/src/bakanet/**.cpp", + "%{prj.location}/src/baknetpch.h", + } + + links + { + "bakatools" + } + + filter "system:windows" + buildoptions "/MDd" + defines + { + "BK_PLATFORM_WINDOWS" + } + + files + { + "%{prj.location}/src/platform/windows/**.h", + "%{prj.location}/src/platform/windows/**.cpp", + } + + links + { + "WS2_32.lib" + } + + filter "system:linux" + defines + { + "BK_PLATFORM_LINUX" + } + + files + { + "%{prj.location}/src/platform/linux/**.h", + "%{prj.location}/src/platform/linux/**.cpp", + } + + filter "configurations:Debug" + defines + { + "BK_DEBUG", + "DEBUG" + } + runtime "Debug" + symbols "on" + + + filter "configurations:Release" + defines + { + "BK_RELEASE", + "NDEBUG" + } + runtime "Release" + optimize "on" \ No newline at end of file diff --git a/sandbox/premake5.lua b/sandbox/premake5.lua deleted file mode 100755 index 8757294..0000000 --- a/sandbox/premake5.lua +++ /dev/null @@ -1,66 +0,0 @@ -project "server" - location "./server" - kind "ConsoleApp" - language "C++" - cppdialect "C++20" - systemversion "latest" - - targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") - objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") - - defines - { - "BKMOD_ALL" - } - - includedirs - { - "%{IncludeDirs.spdlog}", - "%{IncludeDirs.bakanet}", - "%{IncludeDirs.bakatools}" - } - - files - { - "%{prj.location}/**.h", - "%{prj.location}/**.cpp", - } - - links - { - "bakanet", - "bakatools" - } - - filter "system:linux" - defines - { - "BK_PLATFORM_LINUX" - } - - filter "system:windows" - buildoptions "/MDd" - defines - { - "BK_PLATFORM_WINDOWS" - } - - filter "configurations:Debug" - defines - { - "BK_DEBUG", - "DEBUG" - } - runtime "Debug" - symbols "on" - - filter "configurations:Release" - defines - { - "BK_RELEASE", - "NDEBUG" - } - runtime "Release" - optimize "on" - - diff --git a/sandbox/server/main.cpp b/sandbox/server/main.cpp deleted file mode 100755 index 7ce5742..0000000 --- a/sandbox/server/main.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include - -#define PORT 8080 - -using namespace Bk::Net; - -int main() -{ - Bk::Log::init("Bakanet"); - IpAddress ip; - HttpServer server(ip, PORT); - server.get("/", [](HttpRequest& req) - { - BK_INFO("URL /"); - HttpReponse res(HTTP_RES_200, req.version); - res.body = "

Coucou de /

"; - return res; - }); - server.post("/home/", [](HttpRequest& req) - { - HttpReponse res(HTTP_RES_200, "HTTP/1.1"); - res.body = "Success"; - BK_INFO("\n{0}\n{1}", req.body, res.to_string()); - return res; - }); - server.start(); - return 0; -} - - - diff --git a/bakanet/src/bakanet.h b/src/bakanet.h similarity index 100% rename from bakanet/src/bakanet.h rename to src/bakanet.h diff --git a/bakanet/src/bakanet/core/dns_lookup.h b/src/bakanet/core/dns_lookup.h similarity index 100% rename from bakanet/src/bakanet/core/dns_lookup.h rename to src/bakanet/core/dns_lookup.h diff --git a/bakanet/src/bakanet/core/ip_address.h b/src/bakanet/core/ip_address.h similarity index 100% rename from bakanet/src/bakanet/core/ip_address.h rename to src/bakanet/core/ip_address.h diff --git a/bakanet/src/bakanet/core/ip_protocol.h b/src/bakanet/core/ip_protocol.h similarity index 100% rename from bakanet/src/bakanet/core/ip_protocol.h rename to src/bakanet/core/ip_protocol.h diff --git a/bakanet/src/bakanet/core/ip_version.h b/src/bakanet/core/ip_version.h similarity index 100% rename from bakanet/src/bakanet/core/ip_version.h rename to src/bakanet/core/ip_version.h diff --git a/bakanet/src/bakanet/core/socket.h b/src/bakanet/core/socket.h similarity index 100% rename from bakanet/src/bakanet/core/socket.h rename to src/bakanet/core/socket.h diff --git a/bakanet/src/bakanet/core/socket_options.h b/src/bakanet/core/socket_options.h similarity index 100% rename from bakanet/src/bakanet/core/socket_options.h rename to src/bakanet/core/socket_options.h diff --git a/bakanet/src/bakanet/http/packet.cpp b/src/bakanet/http/packet.cpp similarity index 100% rename from bakanet/src/bakanet/http/packet.cpp rename to src/bakanet/http/packet.cpp diff --git a/bakanet/src/bakanet/http/packet.h b/src/bakanet/http/packet.h similarity index 100% rename from bakanet/src/bakanet/http/packet.h rename to src/bakanet/http/packet.h diff --git a/bakanet/src/bakanet/http/server.cpp b/src/bakanet/http/server.cpp similarity index 100% rename from bakanet/src/bakanet/http/server.cpp rename to src/bakanet/http/server.cpp diff --git a/bakanet/src/bakanet/http/server.h b/src/bakanet/http/server.h similarity index 100% rename from bakanet/src/bakanet/http/server.h rename to src/bakanet/http/server.h diff --git a/bakanet/src/bakanetpch.h b/src/bakanetpch.h similarity index 100% rename from bakanet/src/bakanetpch.h rename to src/bakanetpch.h diff --git a/bakanet/src/platform/linux/linux_dns_lookup.cpp b/src/platform/linux/linux_dns_lookup.cpp similarity index 100% rename from bakanet/src/platform/linux/linux_dns_lookup.cpp rename to src/platform/linux/linux_dns_lookup.cpp diff --git a/bakanet/src/platform/linux/linux_ip_address.cpp b/src/platform/linux/linux_ip_address.cpp similarity index 100% rename from bakanet/src/platform/linux/linux_ip_address.cpp rename to src/platform/linux/linux_ip_address.cpp diff --git a/bakanet/src/platform/linux/linux_socket.cpp b/src/platform/linux/linux_socket.cpp similarity index 100% rename from bakanet/src/platform/linux/linux_socket.cpp rename to src/platform/linux/linux_socket.cpp diff --git a/bakanet/src/platform/linux/linux_socket.h b/src/platform/linux/linux_socket.h similarity index 100% rename from bakanet/src/platform/linux/linux_socket.h rename to src/platform/linux/linux_socket.h diff --git a/bakanet/src/platform/windows/windows_dns_lookup.cpp b/src/platform/windows/windows_dns_lookup.cpp similarity index 100% rename from bakanet/src/platform/windows/windows_dns_lookup.cpp rename to src/platform/windows/windows_dns_lookup.cpp diff --git a/bakanet/src/platform/windows/windows_ip_adress.cpp b/src/platform/windows/windows_ip_adress.cpp similarity index 100% rename from bakanet/src/platform/windows/windows_ip_adress.cpp rename to src/platform/windows/windows_ip_adress.cpp diff --git a/bakanet/src/platform/windows/windows_socket.cpp b/src/platform/windows/windows_socket.cpp similarity index 100% rename from bakanet/src/platform/windows/windows_socket.cpp rename to src/platform/windows/windows_socket.cpp diff --git a/bakanet/src/platform/windows/windows_socket.h b/src/platform/windows/windows_socket.h similarity index 100% rename from bakanet/src/platform/windows/windows_socket.h rename to src/platform/windows/windows_socket.h diff --git a/vendor/bakatools b/vendor/bakatools deleted file mode 160000 index 40d24e3..0000000 --- a/vendor/bakatools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 40d24e39a7a7b39a056418d78162103036e6534a diff --git a/vendor/spdlog b/vendor/spdlog deleted file mode 160000 index 23587b0..0000000 --- a/vendor/spdlog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 23587b0d9aebad231d7ba4f16873d70edd2b9dee