From e4c2e711dbd9eb8682692b84a782db3eaca94f0b Mon Sep 17 00:00:00 2001 From: "balhau@balhau.net" Date: Sat, 25 Dec 2021 10:15:30 +0000 Subject: [PATCH] Premake refactor --- clab/hello | Bin 8519 -> 0 bytes clab/hello.c | 5 ----- clab/module.c | 7 ------ premake5.lua | 42 ++++++++++++++++++++++++++++++++++++ src/bmath/complex.cpp | 2 +- src/bmath/demos/complex.cpp | 2 +- src/bmath/demos/math.cpp | 2 +- src/bmath/math.cpp | 2 +- src/cpu/avx2.cpp | 2 +- src/cpu/demos/sse.cpp | 6 +++--- src/cpu/naive.cpp | 4 ++-- src/cpu/sse.cpp | 2 +- src/misc/memory/model.cpp | 4 ++-- 13 files changed, 55 insertions(+), 25 deletions(-) delete mode 100755 clab/hello delete mode 100644 clab/hello.c delete mode 100644 clab/module.c create mode 100644 premake5.lua diff --git a/clab/hello b/clab/hello deleted file mode 100755 index 9912a45b884d5b045e73885ebddcb13de95e9cd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8519 zcmeHMZERat89ug?CS6;{EoJlCt+Aj**{0kjZI)$JW!L%Yb(OTGbuvwm-Z-(-c=JbO zU$5y9C6INJ1sw>XDMLc^XCH0bqs1ShZfiXcsI&?RJFg_zweRfYA4^+Fdr z#CEX`NF)BbEFo#e;v{qkCs zWJ~Gr6)R5pl4@kBQ70I>ExV*91WV?96+DXbZc{)R9#Qq(sb6lY_OVo|cr=xq=m=^Glkjq*`Dt9?k+8#)ppBvlYg?^e{e+B#QhkAMlo;2pXLCSzxHbSjdx#um7N_5$sjq~>&snSzxUrb&RAw_-WV zOvjQLAji|$j6zJYe<;%1XYST^YmbpTFMgCf@`rgRH6aSylIy9oQ|T)$<1$BMNBzMm z7#NpXn$FY@oI(yXE-sf@JilMT=*glo%E|A=&|`q~oo&JQESca9mw_l^0#-8>wPTwYqj zOf@cFI4s5Gc8IILfZ?sFmezhD7WX625u;s)Fy>eMM)ArC@7Tpfs*nP_HFlng%B7ap zIl>l6WBUs$KG++@Ul|v!KWTWDjdxZGApepKjnlsa*(kng^WRtexqVL~UQyUQ0_N3I z2xRQd#z8=yk1tYtjro1S^)Rq@R6^J~az5lobj2&><*{qu0Hvi>T+2g}4|Hgt_|1PC z#lp?=?^5I5{;XX7HGI85QHbzU;bJ*F8Y$imk3@>U4@Za2>^j#RLKDuklRP@~(3Q?V z8W%qG(a2mK1KBwJp|ykgL&fVu#oPVxQQrC|WB#JYc;ZIkIt|#@#=>6@kA;tg&5Ki0 z8ry%2ag<}MhSY<(Wh7FmZ0JNbmx>F|cHdswD`-0jp|Uy1amd4v!)Veu$Qj7DAZfe< zYO>M#q~v-2i15q?Jli)mHUGfV6d;`T5AWGYOHkTidWfIE?{)&h{=kdgzD?^!Q8831i{pP5koY2JKzt# z*%HI?AcZB_Iz5YAH>!e?&$ip7^h=6=ztZ`9CGY9L z=w41~n=M2TPg<1toX6$={H&ZMe8H=esGRwNsy;sJEP8b+7Wc@j5c`y*a{#5FEyU-Q zWKnrW#^WU=eiksKW}i(RQ}cNe7Ad8)HZ>*&(< zJY?fSX!(eaXld^=C%p`HO60^8YK|xtI9iMU%DI9w+j7p-pDf=|sljp8M}4 zttXm0Ja2ovI<)Hh6kbmf#D(V>>t95M<}mZ4UL9KXeMLxW)k{M)D|2*yb@DB*E^$ja z+$pu{#m( z^*9QQ_5kMdz7kX$1Mefs&8q%8h5}l{%;$AGs`y+V$Io^wp9P=x1lD<97+3s|s+jgU zXZ#8l&m%*9%KSN>E{otoZKw-28Jceo689yO)mfy#!?x@UP9+wZmb=J@C;Z~?oNbY!9XL$oQPQFmj5&WXBLwc!Rn8%XF$I0(d z{0+$NV3VqmZ zqjhngu_v2aI`nKi1*66Owsf<iK_9Qn##{5B7e& zdfe^%4TM{M1J8E=Ki5Wz2PDA(BRU2|)*6`{StmfU4`x52R*7o{N - -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