YGGverse
/
hlsdk-portable
mirror of https://github.com/YGGverse/hlsdk-portable.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix build.

theyhunger
Night Owl 6 years ago
parent
284c34dd1b
commit
8aeb27a6b9
1 changed files with 0 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      dlls/CMakeLists.txt

5
dlls/CMakeLists.txt
Unescape View File

@ -158,13 +158,8 @@ set (SVDLL_SOURCES
../pm_shared/pm_math.c ../pm_shared/pm_math.c
../pm_shared/pm_shared.c ../pm_shared/pm_shared.c
) )
<<<<<<< HEAD
include_directories (. hunger wpn_shared ../common ../engine ../pm_shared ../game_shared ../public) 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) if(USE_VOICEMGR)
set(SVDLL_SOURCES set(SVDLL_SOURCES

Write Preview
Loading…
Cancel
Save