diff --git a/.gitmodules b/.gitmodules index ce8763e..fb2195e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,27 @@ [submodule "libraries/event"] path = libraries/event url = https://github.com/libevent/libevent.git +[submodule "TeaSpeak"] + path = TeaSpeak + url = http://git.mcgalaxy.de:8090/WolverinDEV/TeaSpeak.git +[submodule "libraries/spdlog"] + path = libraries/spdlog + url = http://git.mcgalaxy.de:8090/WolverinDEV/spdlog.git +[submodule "libraries/StringVariable"] + path = libraries/StringVariable + url = https://github.com/WolverinDEV/StringVariable.git +[submodule "libraries/ed25519"] + path = libraries/ed25519 + url = https://github.com/WolverinDEV/ed25519.git +[submodule "libraries/breakpad"] + path = libraries/breakpad + url = https://chromium.googlesource.com/breakpad/breakpad +[submodule "mysqlconnector"] + path = mysqlconnector + url = https://github.com/mysql/mysql-connector-cpp.git +[submodule "libraries/mysqlconnector"] + path = libraries/mysqlconnector + url = https://github.com/mysql/mysql-connector-cpp.git +[submodule "libraries/boringssl"] + path = libraries/boringssl + url = https://boringssl.googlesource.com/boringssl diff --git a/TeaSpeak b/TeaSpeak index bd7b5cc..43023c6 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit bd7b5cc57096a67408947eeb54fd297ad2c13e00 +Subproject commit 43023c65a76914e41ec99d845ce578899f13333d diff --git a/init_modules.sh b/init_modules.sh new file mode 100755 index 0000000..b92d28e --- /dev/null +++ b/init_modules.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | + while read path_key path + do + url_key=$(echo $path_key | sed 's/\.path/.url/') + url=$(git config -f .gitmodules --get "$url_key") + git submodule add $url $path + done diff --git a/libraries/CXXTerminal b/libraries/CXXTerminal index 7d5c141..cfcf317 160000 --- a/libraries/CXXTerminal +++ b/libraries/CXXTerminal @@ -1 +1 @@ -Subproject commit 7d5c141ad0f4d43d0c5159e6be0588938116cf08 +Subproject commit cfcf317507ef4a991ecca3a14a358ffaae0582b0 diff --git a/libraries/StringVariable b/libraries/StringVariable new file mode 160000 index 0000000..7868b90 --- /dev/null +++ b/libraries/StringVariable @@ -0,0 +1 @@ +Subproject commit 7868b90427efa06e8d3cf8fb3eba9305e3aa1081 diff --git a/libraries/Thread-Pool b/libraries/Thread-Pool index cba6e82..8366444 160000 --- a/libraries/Thread-Pool +++ b/libraries/Thread-Pool @@ -1 +1 @@ -Subproject commit cba6e82b2f2fe6ff4f584da49a92c4d4d94509a6 +Subproject commit 83664441746e91bba8c8636ca4d51a9be7bfa249 diff --git a/libraries/boringssl b/libraries/boringssl new file mode 160000 index 0000000..e0afc85 --- /dev/null +++ b/libraries/boringssl @@ -0,0 +1 @@ +Subproject commit e0afc85719db9a0842bcfddcf4b15e856b253ee2 diff --git a/libraries/breakpad b/libraries/breakpad new file mode 160000 index 0000000..ecbbfbe --- /dev/null +++ b/libraries/breakpad @@ -0,0 +1 @@ +Subproject commit ecbbfbeb9dee9de92f6dac680e20c63ba9406426 diff --git a/libraries/build.sh b/libraries/build.sh new file mode 100644 index 0000000..e721bd5 --- /dev/null +++ b/libraries/build.sh @@ -0,0 +1,3 @@ + +mkdir -p CXXTerminal/build event/build jsoncpp/build opus/build opusfile/build Thread-Pool/build tomcrypt/build tommath/build yaml-cpp/build + diff --git a/libraries/ed25519 b/libraries/ed25519 new file mode 160000 index 0000000..98bd4f3 --- /dev/null +++ b/libraries/ed25519 @@ -0,0 +1 @@ +Subproject commit 98bd4f3ec60ab1bb09b6becd7a5e1d91d35c81cd diff --git a/libraries/event b/libraries/event index 08a0d36..514dc75 160000 --- a/libraries/event +++ b/libraries/event @@ -1 +1 @@ -Subproject commit 08a0d366073eacf800027725891c2f668f2f0144 +Subproject commit 514dc7579c43e673bdf613e01690371438661260 diff --git a/libraries/jsoncpp b/libraries/jsoncpp index 313a0e4..80bc776 160000 --- a/libraries/jsoncpp +++ b/libraries/jsoncpp @@ -1 +1 @@ -Subproject commit 313a0e4c340253f3ad2c7897b54fad9a8040847c +Subproject commit 80bc776bae74261742b7c2d0b8dc31ec1718ba4a diff --git a/libraries/mysqlconnector b/libraries/mysqlconnector new file mode 160000 index 0000000..36b7e30 --- /dev/null +++ b/libraries/mysqlconnector @@ -0,0 +1 @@ +Subproject commit 36b7e300a396a85249503f862a19941a5808f178 diff --git a/libraries/opus b/libraries/opus index 610c14c..c1c247d 160000 --- a/libraries/opus +++ b/libraries/opus @@ -1 +1 @@ -Subproject commit 610c14ce80ad1a6754a9e2743e6799cf45a093c5 +Subproject commit c1c247d7e715100a50ca185948c7336bdd4dfdba diff --git a/libraries/opusfile b/libraries/opusfile new file mode 160000 index 0000000..1896473 --- /dev/null +++ b/libraries/opusfile @@ -0,0 +1 @@ +Subproject commit 189647328ce1d41bc5c19a5b86eaeb10f12f4013 diff --git a/libraries/spdlog b/libraries/spdlog index 84d3c90..94c2ddf 160000 --- a/libraries/spdlog +++ b/libraries/spdlog @@ -1 +1 @@ -Subproject commit 84d3c90b93afd52a7ba3d659d144b996a36fa82b +Subproject commit 94c2ddf19d6ccbb60ff54ab7b0933689b0c0d0ee diff --git a/libraries/tomcrypt b/libraries/tomcrypt index 0f7fd3c..5f0bdab 160000 --- a/libraries/tomcrypt +++ b/libraries/tomcrypt @@ -1 +1 @@ -Subproject commit 0f7fd3c606c204cf13b39ca35722782d3d05e319 +Subproject commit 5f0bdabfc023376fed3640391f1a9228a4449fb0 diff --git a/libraries/yaml-cpp b/libraries/yaml-cpp index 5d5bb52..1698b47 160000 --- a/libraries/yaml-cpp +++ b/libraries/yaml-cpp @@ -1 +1 @@ -Subproject commit 5d5bb52ec2825eb4c0c932a9c2d50dc3699f932f +Subproject commit 1698b47b65feded180f44d762ddaf7181a270608 diff --git a/libs.txt b/libs.txt index 51e80e3..55f9167 100644 --- a/libs.txt +++ b/libs.txt @@ -1,4 +1,7 @@ sudo apt-get install libssl-dev -sudo apt-get install libevent-dev sudo apt-get install libsqlite3-dev sudo apt-get install libevent-dev +sudo apt-get install autotools-dev +sudo apt-get install automake +sudo apt-get install libtool +sudo apt-get install libmysqlclient-dev diff --git a/notes.txt b/notes.txt index 876faf1..ca52be7 100644 --- a/notes.txt +++ b/notes.txt @@ -1,2 +1,44 @@ +Before you're doing something: +git submodule update --remote +git submodule update --remote -f --merge --recursive + + Build everythink with C++ ABI = 0 (yaml-cpp needs CMakeLists.txt entry) + +make -j 12 CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" + +For jsoncpp: +make -j 12 CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11" +NOTE: May was CXXFLAGS (without the underscore) + +For yaml: +cmake .. -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=Release +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" + +For MySQL: +git submodule update --init +mkdir build && cd build +cmake .. -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -static-libgcc -static-libstdc++" -DWITH_JDBC=ON +make -j 12 + +For boringssl: +cmake .. -DBUILD_SHARED_LIBS=ON +make -j 8 + +Instal protobuf: +sudo apt-get install -y git autoconf automake libtool curl make g++ unzip +git clone https://github.com/google/protobuf.git +cd protobuf/ +./autogen.sh +./configure +make +make check +sudo make install +