Merge kamilprzyb and main repo's code

This commit is contained in:
darkredtitan
2020-08-26 16:30:42 +02:00
parent 60be814e16
commit 826304dae5
29 changed files with 269662 additions and 92 deletions

View File

@@ -35,7 +35,7 @@ include_directories(src)
file(GLOB_RECURSE SOURCES src/**.cpp src/**.hpp)
add_executable(openfusion ${SOURCES})
add_executable(openfusion ${SOURCES} "src/Database.cpp" "src/contrib/sqlite/shell.c" "src/contrib/sqlite/sqlite3.c" "src/contrib/sqlite/sqlite3pp.cpp" "src/contrib/sqlite/sqlite3ppext.cpp" "src/contrib/bcrypt/bcrypt.c" "src/contrib/bcrypt/crypt_blowfish.c" "src/contrib/bcrypt/crypt_gensalt.c" "src/contrib/bcrypt/wrapper.c")
set_target_properties(openfusion PROPERTIES OUTPUT_NAME ${BIN_NAME})