commit 85e824153a6956f2aab67a395a4826dc50760e33
Author: Max Waine <bobishmax@hotmail.com>
AuthorDate: Mon Dec 31 00:57:50 2018 +0000
Commit: Max Waine <bobishmax@hotmail.com>
CommitDate: Mon Dec 31 01:00:10 2018 +0000
Fix src/win32 being always included in CMake
---
src/CMakeLists.txt | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2a2a3ff..99ad62ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -95,9 +95,14 @@ set(GAME_SOURCE_FILES
w_merge.c w_merge.h
z_zone.c z_zone.h)
+set(GAME_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/../")
+
if(MSVC)
list(APPEND GAME_SOURCE_FILES
"../win32/win_opendir.c" "../win32/win_opendir.h")
+
+ list(APPEND GAME_INCLUDE_DIRS
+ "${PROJECT_SOURCE_DIR}/win32/")
endif()
set(DEHACKED_SOURCE_FILES
@@ -126,8 +131,7 @@ else()
add_executable("${PROGRAM_PREFIX}doom" ${SOURCE_FILES_WITH_DEH})
endif()
-target_include_directories("${PROGRAM_PREFIX}doom"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
+target_include_directories("${PROGRAM_PREFIX}doom" PRIVATE ${GAME_INCLUDE_DIRS})
target_link_libraries("${PROGRAM_PREFIX}doom" doom ${EXTRA_LIBS})
if(MSVC)
@@ -141,8 +145,7 @@ else()
add_executable("${PROGRAM_PREFIX}heretic" ${SOURCE_FILES_WITH_DEH})
endif()
-target_include_directories("${PROGRAM_PREFIX}heretic"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
+target_include_directories("${PROGRAM_PREFIX}heretic" PRIVATE ${GAME_INCLUDE_DIRS})
target_link_libraries("${PROGRAM_PREFIX}heretic" heretic ${EXTRA_LIBS})
if(MSVC)
@@ -156,8 +159,7 @@ else()
add_executable("${PROGRAM_PREFIX}hexen" ${SOURCE_FILES})
endif()
-target_include_directories("${PROGRAM_PREFIX}hexen"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
+target_include_directories("${PROGRAM_PREFIX}hexen" PRIVATE ${GAME_INCLUDE_DIRS})
target_link_libraries("${PROGRAM_PREFIX}hexen" hexen ${EXTRA_LIBS})
if(MSVC)
@@ -171,8 +173,7 @@ else()
add_executable("${PROGRAM_PREFIX}strife" ${SOURCE_FILES_WITH_DEH})
endif()
-target_include_directories("${PROGRAM_PREFIX}strife"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
+target_include_directories("${PROGRAM_PREFIX}strife" PRIVATE ${GAME_INCLUDE_DIRS})
target_link_libraries("${PROGRAM_PREFIX}strife" strife ${EXTRA_LIBS})
if(MSVC)