diff --git a/.gitmodules b/.gitmodules index 7a436bb..acc8d50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,11 @@ [submodule "libraries/jsoncpp"] path = libraries/jsoncpp url = https://github.com/open-source-parsers/jsoncpp.git + branch = master [submodule "libraries/Thread-Pool"] path = libraries/Thread-Pool url = http://git.mcgalaxy.de:8090/WolverinDEV/Thread-Pool.git + branch = master [submodule "libraries/tomcrypt"] path = libraries/tomcrypt url = http://git.mcgalaxy.de:8090/WolverinDEV/tomcrypt.git @@ -13,6 +15,7 @@ [submodule "libraries/CXXTerminal"] path = libraries/CXXTerminal url = https://github.com/WolverinDEV/CXXTerminal.git + branch = master [submodule "libraries/opus"] path = libraries/opus url = https://github.com/xiph/opus diff --git a/TeaSpeak b/TeaSpeak index 6cd78d9..6c572a7 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit 6cd78d933856583fde27e3048016bf17b4f43e2b +Subproject commit 6c572a7669783985d4da39c7e0a15f8d49bae336 diff --git a/libraries/CXXTerminal b/libraries/CXXTerminal index 263013e..15d5215 160000 --- a/libraries/CXXTerminal +++ b/libraries/CXXTerminal @@ -1 +1 @@ -Subproject commit 263013e9f68c9ba30c28742ac5b7dae847190304 +Subproject commit 15d52159371b12da64230dfc4bb9e844c023d249 diff --git a/libraries/boringssl b/libraries/boringssl index e0afc85..e7b7877 160000 --- a/libraries/boringssl +++ b/libraries/boringssl @@ -1 +1 @@ -Subproject commit e0afc85719db9a0842bcfddcf4b15e856b253ee2 +Subproject commit e7b78770eca9724a7af2f344588693dcf8b327df diff --git a/libraries/breakpad b/libraries/breakpad index ecbbfbe..948ce04 160000 --- a/libraries/breakpad +++ b/libraries/breakpad @@ -1 +1 @@ -Subproject commit ecbbfbeb9dee9de92f6dac680e20c63ba9406426 +Subproject commit 948ce04ed74397331c158c13209fd2370c2dbd5a diff --git a/libraries/build.sh b/libraries/build.sh old mode 100644 new mode 100755 index e721bd5..5a09baf --- a/libraries/build.sh +++ b/libraries/build.sh @@ -1,3 +1,17 @@ -mkdir -p CXXTerminal/build event/build jsoncpp/build opus/build opusfile/build Thread-Pool/build tomcrypt/build tommath/build yaml-cpp/build - +mkdir -p \ + boringssl/build \ + breakpad/build \ + CXXTerminal/build \ + ed25519/build \ + event/build \ + jsoncpp/build \ + mysqlconnector/build \ + opus/build \ + opusfile/build \ + spdlog/build \ + StringVariable/build \ + Thread-Pool/build \ + tomcrypt/build \ + tommath/build \ + yaml-cpp/build diff --git a/libraries/event b/libraries/event index 514dc75..c3a6fe7 160000 --- a/libraries/event +++ b/libraries/event @@ -1 +1 @@ -Subproject commit 514dc7579c43e673bdf613e01690371438661260 +Subproject commit c3a6fe75e1511a4c7a7a6ef0a5954b1918902933 diff --git a/libraries/jsoncpp b/libraries/jsoncpp index 80bc776..2baad49 160000 --- a/libraries/jsoncpp +++ b/libraries/jsoncpp @@ -1 +1 @@ -Subproject commit 80bc776bae74261742b7c2d0b8dc31ec1718ba4a +Subproject commit 2baad4923e6d9a7e09982cfa4b1c5fd0b67ebd87 diff --git a/libraries/mysqlconnector b/libraries/mysqlconnector index 36b7e30..7abcdc8 160000 --- a/libraries/mysqlconnector +++ b/libraries/mysqlconnector @@ -1 +1 @@ -Subproject commit 36b7e300a396a85249503f862a19941a5808f178 +Subproject commit 7abcdc88c8235f02096e21b5bcd72e8312508f61 diff --git a/libraries/opus b/libraries/opus index c1c247d..38fca4a 160000 --- a/libraries/opus +++ b/libraries/opus @@ -1 +1 @@ -Subproject commit c1c247d7e715100a50ca185948c7336bdd4dfdba +Subproject commit 38fca4a203a6759f2c90b86c84c4db087982ca81 diff --git a/notes.txt b/notes.txt index 39874ec..c6d513b 100644 --- a/notes.txt +++ b/notes.txt @@ -1,6 +1,6 @@ Before you're doing something: -git submodule update --init --recursive -git submodule update --remote -f --merge --recursive +First time: git submodule update --init --recursive --remote +Afterworks: git submodule update --remote -f --merge --recursive Build everythink with C++ ABI = 0 @@ -18,7 +18,6 @@ make -j 12 CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11 -fPIC" For breakpad: git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss -mkdir build && cd build ../configure make CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11" @@ -29,7 +28,7 @@ cmake .. -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -static-libgcc -static-li make -j 12 For boringssl: -cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYOP="Release" +cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" make -j 8 Instal protobuf: