Compiles with no ipc

This commit is contained in:
Jenny White 2018-04-27 23:56:09 +03:00
parent ee6998fcde
commit 38cda23831
4 changed files with 12 additions and 5 deletions

View File

@ -63,11 +63,11 @@ target_include_directories(cathook PRIVATE
add_subdirectory(include)
add_subdirectory(src)
find_library(LIBSDL2 NAMES libSDL2-2.0.so.0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
find_library(LIBTIER0 NAMES tier0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
find_library(LIBVSTDLIB NAMES vstdlib PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
find_library(ValveLibrarySDL2 NAMES libSDL2-2.0.so.0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
find_library(ValveLibraryTier0 NAMES tier0 PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
find_library(ValveLibraryVStdLib NAMES vstdlib PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
# TODO glez_LIBRARIES?
target_link_libraries(cathook ${LIBTIER0} ${LIBVSTDLIB} glez xoverlay ssl GLEW stdc++ ${LIBSDL2})
target_link_libraries(cathook ${ValveLibrarySDL2} ${ValveLibraryTier0} ${ValveLibraryVStdLib} glez xoverlay ssl GLEW stdc++)
set_target_properties(cathook PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

View File

@ -18,10 +18,13 @@ namespace catbot
bool is_a_catbot(unsigned steamID);
bool should_ignore_player(CachedEntity *player);
void update_ipc_data(ipc::user_data_s &data);
void update();
void init();
void level_init();
#if ENABLE_IPC
void update_ipc_data(ipc::user_data_s &data);
#endif
}
}
}

View File

@ -172,10 +172,12 @@ bool should_ignore_player(CachedEntity *player)
return is_a_catbot(player->player_info.friendsID);
}
#if ENABLE_IPC
void update_ipc_data(ipc::user_data_s &data)
{
data.ingame.bot_count = count_bots;
}
#endif
Timer level_init_timer{};

View File

@ -267,6 +267,7 @@ void DrawTick()
#endif
}
#if ENABLE_IPC
static CatCommand
follow_me("fb_follow_me", "IPC connected bots will follow you", []() {
if (!ipc::peer)
@ -303,6 +304,7 @@ static CatCommand
ipc::commands::execute_client_cmd, 0, 0);
}
});
#endif
}
}
}