mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-29 08:00:56 -04:00
Merge branch 'master' of https://github.com/OpenMW/openmw into unshield
Conflicts: apps/wizard/CMakeLists.txt
This commit is contained in:
commit
4bf5c89e6f
@ -95,7 +95,7 @@ include(${QT_USE_FILE})
|
|||||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
if (OPENMW_USE_UNSHIELD)
|
if (OPENMW_USE_UNSHIELD)
|
||||||
include_directories(${LIBUNSHIELD_INCLUDE})
|
include_directories(${LIBUNSHIELD_INCLUDE_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(openmw-wizard
|
add_executable(openmw-wizard
|
||||||
|
Loading…
x
Reference in New Issue
Block a user