Compiles and injects 😉 but not without a crash 🐛.

This commit is contained in:
Jenny White 2018-04-27 00:43:07 +03:00
parent f2f0912321
commit 49a6d408c9
3 changed files with 14 additions and 24 deletions

View File

@ -3,16 +3,18 @@
cmake_minimum_required(VERSION 3.0)
project(cathook VERSION 0.0.1 DESCRIPTION "Free Source Engine Trainer")
find_library(SDL2 REQUIRED)
find_package(SDL2 REQUIRED)
find_package(OpenSSL REQUIRED)
add_library(cathook SHARED "")
set_target_properties(cathook PROPERTIES COMPILE_FLAGS "-m32 -msse -msse2 -msse3" LINK_FLAGS "-m32")
set_target_properties(cathook PROPERTIES COMPILE_FLAGS "-m32 -msse -msse2 -msse3" LINK_FLAGS "-m32 -static")
target_compile_definitions(cathook PRIVATE
GAME=tf2
ENABLE_VISUALS=1
ENABLE_IPC=1
ENABLE_GUI=1
ENABLE_NULL_GRAPHICS=0
TEXTMODE_STDIN=0
TEXTMODE_VAC=0
@ -48,25 +50,13 @@ target_include_directories(cathook PRIVATE
add_subdirectory(include)
add_subdirectory(src)
add_library(libc SHARED IMPORTED)
set_target_properties(libc PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libc.so.6")
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)
add_library(freetype SHARED IMPORTED)
set_target_properties(freetype PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libfreetype.so")
find_library(LIBXOVERLAY NAMES xoverlay)
find_library(LIBGLEZ NAMES glez)
add_library(glew SHARED IMPORTED)
set_target_properties(glew PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libGLEW.so")
target_link_libraries(cathook ${LIBTIER0} ${LIBVSTDLIB} ${LIBGLEZ} ${LIBXOVERLAY} ssl GLEW stdc++ ${LIBSDL2})
add_library(sdl2 SHARED IMPORTED)
set_target_properties(sdl2 PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libSDL2-2.0.so.0")
add_library(stdcpp SHARED IMPORTED)
set_target_properties(stdcpp PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libstdc++.so.6")
add_library(tier0 SHARED IMPORTED)
set_target_properties(tier0 PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libtier0.so")
add_library(vstdlib SHARED IMPORTED)
set_target_properties(vstdlib PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libvstdlib.so")
target_link_libraries(cathook libc freetype glew sdl2 stdcpp tier0 vstdlib)
set_target_properties(cathook PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

View File

@ -113,7 +113,6 @@
#include "copypasted/CSignature.h"
#if ENABLE_GUI
#include "gui/GUI.hpp"
#include "GUI.h"
#endif

View File

@ -26,8 +26,7 @@ public:
struct end_t
{
};
static constexpr end_t end{};
static end_t end;
public:
csv_stream()
{
@ -57,6 +56,8 @@ public:
std::ofstream stream;
};
csv_stream::end_t csv_stream::end{};
csv_stream &operator<<(csv_stream &log, const std::string &string)
{
if (!log.stream.good())