generated config

This commit is contained in:
Jenny White 2018-04-27 22:59:30 +03:00
parent d8ad382335
commit 0d4180166b
7 changed files with 12 additions and 19 deletions

View File

@ -8,6 +8,7 @@ set(GameValues "tf2;hl2dm;dab;tf2c;css;dynamic" CACHE INTERNAL "List of supporte
set_property(CACHE Game PROPERTY STRINGS ${GameValues}) set_property(CACHE Game PROPERTY STRINGS ${GameValues})
set(EnableVisuals 1 CACHE BOOL "Enable Visuals") set(EnableVisuals 1 CACHE BOOL "Enable Visuals")
set(ExternalDrawing 0 CACHE BOOL "External Visuals")
set(EnableGUI 1 CACHE BOOL "Enable GUI") set(EnableGUI 1 CACHE BOOL "Enable GUI")
set(EnableIPC 0 CACHE BOOL "Enable IPC") set(EnableIPC 0 CACHE BOOL "Enable IPC")
set(DataPath "/opt/cathook/data" CACHE STRING "Data location") set(DataPath "/opt/cathook/data" CACHE STRING "Data location")
@ -23,6 +24,8 @@ find_package(SimpleIPC REQUIRED)
get_target_property(SimpleIPC_INCLUDE_DIRS SimpleIPC INTERFACE_INCLUDE_DIRECTORIES) get_target_property(SimpleIPC_INCLUDE_DIRS SimpleIPC INTERFACE_INCLUDE_DIRECTORIES)
configure_file(include/config.h.in ${CMAKE_SOURCE_DIR}/include/config.h @ONLY)
add_library(cathook SHARED "") add_library(cathook SHARED "")
set_target_properties(cathook PROPERTIES COMPILE_FLAGS "-m32 -msse -msse2 -msse3" LINK_FLAGS "-m32 -static") set_target_properties(cathook PROPERTIES COMPILE_FLAGS "-m32 -msse -msse2 -msse3" LINK_FLAGS "-m32 -static")

1
include/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
config.h

View File

@ -1,18 +1,13 @@
/* /*
* common.h * common.hpp
* *
* Created on: Dec 5, 2016 * Created on: Dec 5, 2016
* Author: nullifiedcat * Author: nullifiedcat
*/ */
#ifndef COMMON_H_ #pragma once
#define COMMON_H_
#if defined(LINUX) and not defined(NO_IPC) #include "config.h"
#define ENABLE_IPC 1
#else
#undef ENABLE_IPC
#endif
#include <emmintrin.h> #include <emmintrin.h>
#include <vector> #include <vector>
@ -41,12 +36,12 @@
#include <elf.h> #include <elf.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <string.h>
#include <pwd.h> #include <pwd.h>
#include <assert.h> #include <cstring>
#include <cstdio>
#include <cassert>
#include "timer.hpp" #include "timer.hpp"
#include "averager.hpp" #include "averager.hpp"
@ -151,5 +146,3 @@ template <typename T> constexpr T _clamp(T _min, T _max, T _val)
#define GET_RENDER_CONTEXT \ #define GET_RENDER_CONTEXT \
(IsTF2() ? g_IMaterialSystem->GetRenderContext() \ (IsTF2() ? g_IMaterialSystem->GetRenderContext() \
: g_IMaterialSystemHL->GetRenderContext()) : g_IMaterialSystemHL->GetRenderContext())
#endif /* COMMON_H_ */

View File

@ -2,6 +2,7 @@
#define GAME @Game@ #define GAME @Game@
#define ENABLE_VISUALS @EnableVisuals@ #define ENABLE_VISUALS @EnableVisuals@
#define EXTERNAL_DRAWING @ExternalDrawing@
#define ENABLE_GUI @EnableGUI@ #define ENABLE_GUI @EnableGUI@
#define ENABLE_IPC @EnableIPC@ #define ENABLE_IPC @EnableIPC@
#define DATA_PATH "@DataPath@" #define DATA_PATH "@DataPath@"

View File

@ -23,9 +23,5 @@ constexpr int c_strcmp(char const *lhs, char const *rhs)
: c_strcmp(lhs + 1, rhs + 1); : c_strcmp(lhs + 1, rhs + 1);
} }
#ifndef DATA_PATH
#define DATA_PATH "/opt/cathook"
#endif
#define FEATURE_RADAR_DISABLED #define FEATURE_RADAR_DISABLED
#define FEATURE_FIDGET_SPINNER_DISABLED #define FEATURE_FIDGET_SPINNER_DISABLED

View File

@ -6,7 +6,6 @@
*/ */
#include "common.hpp" #include "common.hpp"
#include <link.h>
CatVar crit_info(CV_SWITCH, "crit_info", "0", "Show crit info"); CatVar crit_info(CV_SWITCH, "crit_info", "0", "Show crit info");
CatVar crit_key(CV_KEY, "crit_key", "0", "Crit Key"); CatVar crit_key(CV_KEY, "crit_key", "0", "Crit Key");

View File

@ -47,7 +47,7 @@ const std::string &hack::GetType()
#if not ENABLE_GUI #if not ENABLE_GUI
version += " NOGUI"; version += " NOGUI";
#else #else
version += " IMGUI"; version += " GUI";
#endif #endif
#ifndef DYNAMIC_CLASSES #ifndef DYNAMIC_CLASSES