ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1967 from RadWolfie/cleanup-includes 

Remove unnecessary includes since they are handled from CMake end
This commit is contained in:
Luke Usher 2020-09-25 12:30:36 +01:00 committed by GitHub
parent e34c990ff4 5af26d23f5
commit 44f1e0937c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/cxbx/CMakeLists.txt
View File

@ -14,14 +14,9 @@ include_directories(
"${CXBXR_ROOT_DIR}/import/OpenXDK/include"
"${CXBXR_ROOT_DIR}/import/distorm/include"
"${CXBXR_ROOT_DIR}/import/glew-2.0.0/include"
"${CXBXR_ROOT_DIR}/import/subhook"
"${CXBXR_ROOT_DIR}/import/DirectX9/include"
"${CXBXR_ROOT_DIR}/import/XbSymbolDatabase"
"${CXBXR_ROOT_DIR}/import/simpleini"
"${CXBXR_ROOT_DIR}/import/libtommath"
"${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
"${CXBXR_ROOT_DIR}/import/winpcap/Include"
"${CXBXR_ROOT_DIR}/import/SDL2/include"
"${CXBXR_ROOT_DIR}/import/xxHash"
)

4
projects/cxbxr-emu/CMakeLists.txt
View File

@ -17,12 +17,8 @@ include_directories(
"${CXBXR_ROOT_DIR}/import/OpenXDK/include"
"${CXBXR_ROOT_DIR}/import/distorm/include"
"${CXBXR_ROOT_DIR}/import/glew-2.0.0/include"
"${CXBXR_ROOT_DIR}/import/subhook"
"${CXBXR_ROOT_DIR}/import/DirectX9/include"
"${CXBXR_ROOT_DIR}/import/XbSymbolDatabase"
"${CXBXR_ROOT_DIR}/import/simpleini"
"${CXBXR_ROOT_DIR}/import/libtommath"
"${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
"${CXBXR_ROOT_DIR}/import/winpcap/Include"
"${CXBXR_ROOT_DIR}/import/xxHash"
)

9
projects/libtom/crypt/CMakeLists.txt
View File

@ -17,11 +17,6 @@ add_compile_definitions(
LTC_NO_PROTOTYPES
)
include_directories(
"${CXBXR_ROOT_DIR}/import/libtommath"
"${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
)
file (GLOB HEADERS
"${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers/tomcrypt.h"
"${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers/tomcrypt_argchk.h"
@ -462,6 +457,10 @@ add_library(libtomcrypt ${HEADERS} ${SOURCES})
target_compile_definitions(libtomcrypt PUBLIC LTM_DESC=1)
target_include_directories(libtomcrypt
PUBLIC "${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
)
target_link_libraries(libtomcrypt
PUBLIC libtommath

9
projects/libtom/math/CMakeLists.txt
View File

@ -11,11 +11,6 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
)
endif()
include_directories(
"${CXBXR_ROOT_DIR}/import/libtommath"
)
file (GLOB HEADERS
"${CXBXR_ROOT_DIR}/import/libtommath/tommath.h"
"${CXBXR_ROOT_DIR}/import/libtommath/tommath_class.h"
@ -170,3 +165,7 @@ source_group(TREE ${CXBXR_ROOT_DIR}/import/libtommath PREFIX header FILES ${HEAD
source_group(TREE ${CXBXR_ROOT_DIR}/import/libtommath PREFIX source FILES ${SOURCES})
add_library(libtommath ${HEADERS} ${SOURCES})
target_include_directories(libtommath
PUBLIC "${CXBXR_ROOT_DIR}/import/libtommath"
)