nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #546 from TotallyNotElite/Pathfinder

Browse Source 
Fix cmake and git issues
This commit is contained in:
TotallyNotElite 2018-08-14 21:17:05 +02:00 committed by GitHub
commit db6fad4d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -278,3 +278,7 @@ cathook.cbp
.cproject .cproject
.settings .settings
\.directory \.directory
\.kdev4/cathook\.kdev4
cathook\.kdev4

6
.gitmodules vendored Executable file → Normal file
View File

@ -16,9 +16,9 @@
[submodule "external/co-library"] [submodule "external/co-library"]
path = external/co-library path = external/co-library
url = https://github.com/nullworks/co-library.git url = https://github.com/nullworks/co-library.git
[submodule "include/TF2_NavFile_Reader"]
path = include/TF2_NavFile_Reader
url = https://github.com/nullworks/TF2_NavFile_Reader.git
[submodule "external/MicroPather"] [submodule "external/MicroPather"]
path = external/MicroPather path = external/MicroPather
url = https://github.com/leethomason/MicroPather url = https://github.com/leethomason/MicroPather
[submodule "external/TF2_NavFile_Reader"]
path = external/TF2_NavFile_Reader
url = https://github.com/nullworks/TF2_NavFile_Reader

1
CMakeLists.txt
View File

@ -112,6 +112,7 @@ target_include_directories(cathook SYSTEM PRIVATE
target_include_directories(cathook PRIVATE "external/ucccccp") target_include_directories(cathook PRIVATE "external/ucccccp")
target_include_directories(cathook PRIVATE "external/MicroPather") target_include_directories(cathook PRIVATE "external/MicroPather")
target_include_directories(cathook PRIVATE "external/TF2_NavFile_Reader")
if(EnableWarnings) if(EnableWarnings)
target_compile_options(cathook PRIVATE -Wall -Wextra) target_compile_options(cathook PRIVATE -Wall -Wextra)

0
include/TF2_NavFile_Reader → external/TF2_NavFile_Reader vendored
View File

1
include/CMakeLists.txt
View File

@ -50,7 +50,6 @@ add_subdirectory(classinfo)
add_subdirectory(copypasted) add_subdirectory(copypasted)
add_subdirectory(hacks) add_subdirectory(hacks)
add_subdirectory(hooks) add_subdirectory(hooks)
add_subdirectory(TF2_NavFile_Reader)
add_subdirectory(reclasses) add_subdirectory(reclasses)
add_subdirectory(sdk) add_subdirectory(sdk)
add_subdirectory(online) add_subdirectory(online)

2
src/CMakeLists.txt
View File

@ -32,7 +32,7 @@ target_sources(cathook PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/velocity.cpp" "${CMAKE_CURRENT_LIST_DIR}/velocity.cpp"
"${CMAKE_CURRENT_LIST_DIR}/votelogger.cpp" "${CMAKE_CURRENT_LIST_DIR}/votelogger.cpp"
"${CMAKE_CURRENT_LIST_DIR}/MiscTemporary.cpp" "${CMAKE_CURRENT_LIST_DIR}/MiscTemporary.cpp"
"${CMAKE_CURRENT_LIST_DIR}/navparser.cpp" "${CMAKE_CURRENT_LIST_DIR}/navparser.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Options.cpp" "${CMAKE_CURRENT_LIST_DIR}/Options.cpp"
"${CMAKE_CURRENT_LIST_DIR}/PlayerTools.cpp") "${CMAKE_CURRENT_LIST_DIR}/PlayerTools.cpp")