diff --git a/cbuild b/cbuild new file mode 160000 index 0000000..dd6253f --- /dev/null +++ b/cbuild @@ -0,0 +1 @@ +Subproject commit dd6253f636a3e3ec2e4fb44e4bf08cecf88ffb9d diff --git a/default.config b/default.config index 23c2c06..2018f93 100644 --- a/default.config +++ b/default.config @@ -1,6 +1,6 @@ #!/bin/bash -CBUILD_VERSION=3 -CONFIG_VERSION=4 +CBUILD_VERSION=4 +CONFIG_VERSION=5 PROJECT=kerep CMP_C=gcc @@ -20,52 +20,44 @@ EXEC_FILE=$PROJECT.com SHARED_LIB_FILE=$PROJECT.so STATIC_LIB_FILE=$PROJECT.a +#can be used in tasks +#PRE_TASK_SCRIPT= +#POST_TASK_SCRIPT= + case $TASK in build_exec) C_ARGS="-O2" CPP_ARGS="$C_ARGS" LINKER_ARGS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT= ;; build_exec_dbg) C_ARGS="-O0 -g" CPP_ARGS="$C_ARGS" LINKER_ARGS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT= ;; build_shared_lib) C_ARGS="-O2 -fpic -flto -shared" CPP_ARGS="$C_ARGS" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT= ;; build_shared_lib_dbg) C_ARGS="-O0 -g -fpic -shared" CPP_ARGS="$C_ARGS" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT= ;; build_static_lib) C_ARGS="-O2 -fpic" - CPP_ARGS="$C_ARGS" + CPP_ARGS="$C_ARGS" TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT= ;; build_static_lib_dbg) C_ARGS="-O0 -g" - CPP_ARGS="$C_ARGS" + CPP_ARGS="$C_ARGS" TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT= ;; exec) TASK_SCRIPT=cbuild/default_tasks/exec.sh @@ -75,3 +67,15 @@ case $TASK in TASK_SCRIPT=cbuild/default_tasks/valgrind.sh ;; esac + +case $OS in + WINDOWS) + LINKER_ARGS="$LINKER_ARGS -lws2_32" + ;; + LINUX) + ;; + *) + printf "${RED}operating system $OS has no configuration variants\n" + exit 1 + ;; +esac diff --git a/src/Network/network.h b/src/Network/network.h index 6581b35..5136e5e 100644 --- a/src/Network/network.h +++ b/src/Network/network.h @@ -6,10 +6,6 @@ extern "C" { #include "../base/base.h" -#if defined(_WIN64) || defined(_WIN32) - #define KN_USE_WINSOCK 1 -#endif - #include "knAddress.h" #include "sockets/knSocketTCP.h" #include "sockets/knSocketUDP.h" diff --git a/src/Network/stdSocketHeaders.h b/src/Network/stdSocketHeaders.h index 136db9c..a3cda90 100644 --- a/src/Network/stdSocketHeaders.h +++ b/src/Network/stdSocketHeaders.h @@ -4,8 +4,15 @@ extern "C" { #endif +#if defined(_WIN64) || defined(_WIN32) + #define KN_USE_WINSOCK 1 +#else + #define KN_USE_WINSOCK 0 +#endif + #if KN_USE_WINSOCK #include + // #include #else #include #include