cleanups

CMakeLists.txt

@@ -497,7 +497,7 @@ if(TARGET_OS STREQUAL "android")
   find_package(Android)
 endif()
 find_package(ZLIB)
-# find_package(Crypto)
+find_package(Crypto)
 find_package(Curl)
 if(CLIENT AND VIDEORECORDER)
   find_package(FFMPEG)
@@ -2622,7 +2622,6 @@ if(SERVER)
 
   # twbl start
   set(TWBL_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src/external/TeeworldsBotLib)
-  add_subdirectory(${TWBL_ROOT})
   include_directories(${TWBL_ROOT}/src)
   FILE(GLOB TWBL_SRC
     ${TWBL_ROOT}/src/shared/*.cpp
@@ -2633,48 +2632,21 @@ if(SERVER)
 
   add_library(twbl_bottick_lite SHARED ${TWBL_SRC})
   set(SERVER_SRC ${SERVER_SRC} ${TWBL_SRC})
-  # set(SERVER_SRC ${SERVER_SRC}
-  #   ${TWBL_ROOT}/src/shared/hotreload.cpp
-  #   ${TWBL_ROOT}/src/shared/hotreload.h
-  #   ${TWBL_ROOT}/src/shared/types.h
-  #   ${TWBL_ROOT}/src/bots/base.cpp
-  #   ${TWBL_ROOT}/src/bots/base.h
-  # )
-
 
   add_library(twbl_bottick SHARED
-    ${SERVER_SRC}
+    ${GAME_SHARED}
     ${TWBL_SRC}
-    ${ANTIBOT_SRC}
     ${GAME_GENERATED_SHARED}
     src/base/hash_ctxt.h
     src/engine/external/md5/md5.h)
 
-  # add_library(md5 EXCLUDE_FROM_ALL OBJECT ${DEP_MD5_SRC})
-  target_link_libraries(twbl_bottick
-    PRIVATE
-    ${CRYPTO_LIBRARIES}
-      ${DEP_MD5_SRC}
-PUBLIC
-    ssl
-  )
-
   target_include_directories(twbl_bottick SYSTEM PRIVATE ${CRYPTO_INCLUDE_DIRS})
-
-target_compile_definitions(twbl_bottick PRIVATE TWBL_SHARED_OBJECT=1)
+  target_compile_definitions(twbl_bottick PRIVATE TWBL_SHARED_OBJECT=1)
 
   target_include_directories(twbl_bottick PRIVATE src)
   target_include_directories(twbl_bottick PRIVATE ${PROJECT_BINARY_DIR}/src)
   target_include_directories(twbl_bottick PRIVATE src/rust-bridge)
   add_cxx_compiler_flag_if_supported(OUR_FLAGS_LINK -rdynamic)
-  add_cxx_compiler_flag_if_supported(OUT_FLAGS_LINK -fno-gnu-unique)
-  add_cxx_compiler_flag_if_supported(OUT_FLAGS_LINK -fPIC)
-  add_cxx_compiler_flag_if_supported(OUT_FLAGS -fno-gnu-unique)
-  add_cxx_compiler_flag_if_supported(OUT_FLAGS -fPIC)
-  target_compile_options(twbl_bottick PUBLIC -fPIC)
-
-  # set_own_rpath(game-server)
-
   # twbl end
 
   # Target