diff --git a/clab/hello b/clab/hello deleted file mode 100755 index 9912a45..0000000 Binary files a/clab/hello and /dev/null differ diff --git a/clab/hello.c b/clab/hello.c deleted file mode 100644 index 4308fc2..0000000 --- a/clab/hello.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -int main(int argc,char **argv){ - printf("Hello world\n"); -} \ No newline at end of file diff --git a/clab/module.c b/clab/module.c deleted file mode 100644 index 78af404..0000000 --- a/clab/module.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int hijackMethod(){ - printf("This should never be called"); - printf("Neither this..."); - return 0; -} \ No newline at end of file diff --git a/premake5.lua b/premake5.lua new file mode 100644 index 0000000..571442c --- /dev/null +++ b/premake5.lua @@ -0,0 +1,42 @@ +workspace "CppLib" + configurations {"Debug", "Release" } + system "linux" + +project "HelloWorld" + kind "ConsoleApp" + language "c++" + targetdir "bin/%{cfg.buildcfg}" + + files {"**.hpp","**.cpp"} + + filter "configurations:Debug" + defines { "DEBUG" } + symbols "On" + + filter "configurations:Release" + defines { "NDEBUG" } + optimize "On" + + filter { "system:linux" } + links { + "wx_gtk3u_xrc-3.0", + "wx_gtk3u_html-3.0", + "wx_gtk3u_adv-3.0", + "wx_gtk3u_core-3.0" , + "wx_baseu_xml-3.0", + "wx_baseu_net-3.0", + "wx_baseu-3.0", + "glfw3" + } + includedirs { + "/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.0" , + "/usr/include/wx-3.0" + } + defines { + "_FILE_OFFSET_BITS=64", + "WXUSINGDLL", + "__WXGTK__" + } + + + \ No newline at end of file diff --git a/src/bmath/complex.cpp b/src/bmath/complex.cpp index e9123c9..148a75d 100644 --- a/src/bmath/complex.cpp +++ b/src/bmath/complex.cpp @@ -1,4 +1,4 @@ -#include "../../include/bmath/complex.hpp" +#include "complex.hpp" /** * Constructor implementation diff --git a/src/bmath/demos/complex.cpp b/src/bmath/demos/complex.cpp index 74c02f3..e542c17 100644 --- a/src/bmath/demos/complex.cpp +++ b/src/bmath/demos/complex.cpp @@ -1,5 +1,5 @@ #include -#include "../../../include/bmath/complex.hpp" +#include "../complex.hpp" using BMath::Complex; diff --git a/src/bmath/demos/math.cpp b/src/bmath/demos/math.cpp index d0c77a6..77c2e62 100644 --- a/src/bmath/demos/math.cpp +++ b/src/bmath/demos/math.cpp @@ -1,4 +1,4 @@ -#include "../../../include/bmath/math.hpp" +#include "../math.hpp" #include using namespace BMath; diff --git a/src/bmath/math.cpp b/src/bmath/math.cpp index 19d2217..81d8483 100644 --- a/src/bmath/math.cpp +++ b/src/bmath/math.cpp @@ -1,4 +1,4 @@ -#include "../../include/bmath/math.hpp" +#include "math.hpp" //http://graphics.stanford.edu/~seander/bithacks.html //https://hbfs.wordpress.com/2008/08/05/branchless-equivalents-of-simple-functions/ diff --git a/src/cpu/avx2.cpp b/src/cpu/avx2.cpp index d3058b0..d48cb37 100644 --- a/src/cpu/avx2.cpp +++ b/src/cpu/avx2.cpp @@ -1,4 +1,4 @@ -#include "../../include/cpu/avx2.hpp" +#include "avx2.hpp" #include #include diff --git a/src/cpu/demos/sse.cpp b/src/cpu/demos/sse.cpp index 9fb4e69..d5c3199 100644 --- a/src/cpu/demos/sse.cpp +++ b/src/cpu/demos/sse.cpp @@ -1,7 +1,7 @@ #include -#include "../../../include/cpu/utils.hpp" -#include "../../../include/cpu/sse.hpp" -#include "../../../include/cpu/naive.hpp" +#include "../utils.hpp" +#include "../sse.hpp" +#include "../naive.hpp" #include using namespace cpu; diff --git a/src/cpu/naive.cpp b/src/cpu/naive.cpp index 1cb2341..8730b38 100644 --- a/src/cpu/naive.cpp +++ b/src/cpu/naive.cpp @@ -1,5 +1,5 @@ -#include "../../include/cpu/naive.hpp" -#include "../../include/cpu/types.hpp" +#include "naive.hpp" +#include "types.hpp" #include void cpu::Naive::sum_128_long(UInt *a,UInt *b){ diff --git a/src/cpu/sse.cpp b/src/cpu/sse.cpp index 0cb6c27..522622d 100644 --- a/src/cpu/sse.cpp +++ b/src/cpu/sse.cpp @@ -1,4 +1,4 @@ -#include "../../include/cpu/sse.hpp" +#include "sse.hpp" #include //X86 Assembly to add two 128 bit numbers in the form of packed integers 32bit diff --git a/src/misc/memory/model.cpp b/src/misc/memory/model.cpp index bf50ce9..c87086d 100644 --- a/src/misc/memory/model.cpp +++ b/src/misc/memory/model.cpp @@ -1,5 +1,5 @@ -#include "../../../include/misc/memory/model.h" -#include "../../../include/misc/util/debug.h" +#include "model.h" +#include "../util/debug.h" #include #include