Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2024-11-14 04:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed a few leftover orm lib settings from the build system.

Browse Source
This commit is contained in:
Relintai 2021-06-18 22:37:56 +02:00
parent d844b2419f
commit b6e75b8fa5
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/drogon/SCsub
View File

@ -8,16 +8,6 @@ env_mod.core_sources = []
env_mod.add_source_files(env_mod.core_sources, "drogon/lib/src/*.cc")
env_mod.add_source_files(env_mod.core_sources, "drogon/lib/src/ssl_funcs/*.cc")
env_mod.add_source_files(env_mod.core_sources, "drogon/orm_lib/src/*.cc")
if env.mysql_available:
env_mod.add_source_files(env_mod.core_sources, "drogon/orm_lib/src/mysql_impl/*.cc")
#env_mod.add_source_files(env_mod.core_sources, "drogon/orm_lib/src/postgresql_impl/*.cc")
#env_mod.add_source_files(env_mod.core_sources, "drogon/orm_lib/src/sqlite3_impl/*.cc")
#todo detect
#env_mod.add_source_files(env_mod.core_sources, "drogon/nosql_lib/redis/src/*.cc")
env_mod.add_source_files(env_mod.core_sources, "trantor/net/*.cc")
env_mod.add_source_files(env_mod.core_sources, "trantor/net/inner/*.cc")
env_mod.add_source_files(env_mod.core_sources, "trantor/net/inner/poller/*.cc")

19
modules/drogon/detect.py
View File

@ -61,27 +61,8 @@ def configure(env):
if not err:
env.ParseConfig("pkg-config libcares --cflags --libs")
#env.Append(CXX=["-std=c++17"])
mariadb_error = os.system("pkg-config mariadb --modversion --silence-errors > /dev/null ")
mysql_error = os.system("pkg-config mysql --modversion --silence-errors > /dev/null ")
if not mariadb_error:
env.ParseConfig("pkg-config mariadb --cflags --libs")
# env.Append(CPPDEFINES=["USE_MYSQL"])
env.mysql_available = True
if not mysql_error:
env.ParseConfig("pkg-config mysql --cflags --libs")
# env.Append(CPPDEFINES=["USE_MYSQL"])
env.mysql_available = True
#USE_SQLITE3
env.Prepend(CPPPATH=["#modules/drogon/drogon/lib/inc"])
env.Prepend(CPPPATH=["#modules/drogon/drogon/orm_lib/inc"])
env.Prepend(CPPPATH=["#modules/drogon/drogon/nosql_lib/redis/inc"])
env.Prepend(CPPPATH=["#modules/drogon/drogon/config"])
env.Prepend(CPPPATH=["#modules/drogon"])