From 7253a877c328be5801fe7da5e2f63c0cdf87a688 Mon Sep 17 00:00:00 2001 From: nullifiedcat Date: Mon, 11 Dec 2017 18:33:52 +0300 Subject: [PATCH] fix defunct makefile --- {src => include}/visual/glez.h | 0 {src => include}/visual/xoverlay.h | 0 makefile | 4 ++-- src/visual/drawex.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {src => include}/visual/glez.h (100%) rename {src => include}/visual/xoverlay.h (100%) diff --git a/src/visual/glez.h b/include/visual/glez.h similarity index 100% rename from src/visual/glez.h rename to include/visual/glez.h diff --git a/src/visual/xoverlay.h b/include/visual/xoverlay.h similarity index 100% rename from src/visual/xoverlay.h rename to include/visual/xoverlay.h diff --git a/makefile b/makefile index ef701428..a0b90a7c 100644 --- a/makefile +++ b/makefile @@ -43,7 +43,7 @@ ENABLE_NULL_GRAPHICS:=1 endif OUT_NAME = libcathook.so -SSDK_DIR=$(realpath source-sdk-2013/mp/src) +SSDK_DIR=$(realpath source-sdk-2013-headers/mp/src) SIPC_DIR=$(realpath simple-ipc/src/include) LIB_DIR=lib SRC_DIR=src @@ -51,7 +51,7 @@ RES_DIR=res OUT_DIR=bin TARGET = $(OUT_DIR)/$(OUT_NAME) -INCLUDES=-I. -Iinclude -Iucccccp -isystem/usr/include/c++/6.3.1 -isystem$(SSDK_DIR)/public -isystem$(SSDK_DIR)/mathlib -isystem$(SSDK_DIR)/common -isystem$(SSDK_DIR)/public/tier1 -isystem$(SSDK_DIR)/public/tier0 -isystem$(SSDK_DIR) +INCLUDES=-Iinclude -I. -Iucccccp -isystem$(SSDK_DIR)/public -isystem$(SSDK_DIR)/mathlib -isystem$(SSDK_DIR)/common -isystem$(SSDK_DIR)/public/tier1 -isystem$(SSDK_DIR)/public/tier0 -isystem$(SSDK_DIR) LDLIBS=-static -l:libc.so.6 -l:libstdc++.so.6 -l:libtier0.so -l:libvstdlib.so LDFLAGS=-shared -L$(realpath $(LIB_DIR)) #LDFLAGS+=-Wl,--no-undefined diff --git a/src/visual/drawex.cpp b/src/visual/drawex.cpp index ef5d1349..0f788d93 100644 --- a/src/visual/drawex.cpp +++ b/src/visual/drawex.cpp @@ -14,7 +14,7 @@ #include extern "C" { -#include "xoverlay.h" +#include "visual/xoverlay.h" } #define DRAW_XOVERLAY 0