From 8aeb27a6b99a62724277045a01da9fbbaaeaaa64 Mon Sep 17 00:00:00 2001 From: Night Owl Date: Wed, 12 Sep 2018 00:01:56 +0500 Subject: [PATCH] Fix build. --- dlls/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt index 0950c2ad..cef728fe 100644 --- a/dlls/CMakeLists.txt +++ b/dlls/CMakeLists.txt @@ -158,13 +158,8 @@ set (SVDLL_SOURCES ../pm_shared/pm_math.c ../pm_shared/pm_shared.c ) -<<<<<<< HEAD include_directories (. hunger wpn_shared ../common ../engine ../pm_shared ../game_shared ../public) -======= - -include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public) ->>>>>>> master if(USE_VOICEMGR) set(SVDLL_SOURCES