From cebc9744c48fbab8e939fa34e91005f27e755cf3 Mon Sep 17 00:00:00 2001
From: durswd <swda.durl@gmail.com>
Date: Thu, 26 Oct 2023 02:18:21 +0900
Subject: [PATCH] Revert "fix"

This reverts commit c9fd28d103fc861b9136614175060006ba97c5b8.
---
 Dev/Cpp/Test/CMakeLists.txt                 | 20 ++++++++++++++------
 Dev/Cpp/TestRuntimeFramework/CMakeLists.txt | 17 +++++++++++++++--
 Dev/Cpp/Viewer/CMakeLists.txt               | 11 ++++++-----
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Dev/Cpp/Test/CMakeLists.txt b/Dev/Cpp/Test/CMakeLists.txt
index 9cba7a86e5..158e31a3ff 100644
--- a/Dev/Cpp/Test/CMakeLists.txt
+++ b/Dev/Cpp/Test/CMakeLists.txt
@@ -26,6 +26,20 @@ set(effekseer_test_src
     Backend/OpenGL.cpp
 )
 
+include_directories(
+    ${EFK_THIRDPARTY_INCLUDES}
+    ../Effekseer/
+    ../EffekseerRendererGL/
+    ../EffekseerSoundAL/
+    )
+
+if(WIN32)
+include_directories(
+    ${EFK_THIRDPARTY_INCLUDES}
+    ../EffekseerRendererDX11/
+    )
+endif()
+
 set(common_lib)
 set(common_inc)
 
@@ -91,12 +105,6 @@ else()
 endif()
 
 add_executable(${PROJECT_NAME} ${effekseer_test_src})
-
-target_include_directories(
-    ${PROJECT_NAME}
-    PRIVATE
-    ${EFK_THIRDPARTY_INCLUDES})
-
 target_link_directories(${PROJECT_NAME} PRIVATE ${EFK_THIRDPARTY_LIBRARY_DIRECTORIES})
 target_link_libraries(${PROJECT_NAME} PRIVATE TestRuntimeFramework)
 
diff --git a/Dev/Cpp/TestRuntimeFramework/CMakeLists.txt b/Dev/Cpp/TestRuntimeFramework/CMakeLists.txt
index e80e8207e6..2c6df71bfe 100644
--- a/Dev/Cpp/TestRuntimeFramework/CMakeLists.txt
+++ b/Dev/Cpp/TestRuntimeFramework/CMakeLists.txt
@@ -55,6 +55,20 @@ if(WIN32)
     )
 endif()
 
+include_directories(
+    ${EFK_THIRDPARTY_INCLUDES}
+    ../Effekseer/
+    ../EffekseerRendererGL/
+    ../EffekseerSoundAL/
+    )
+
+if(WIN32)
+include_directories(
+    ${EFK_THIRDPARTY_INCLUDES}
+    ../EffekseerRendererDX11/
+    )
+endif()
+
 set(common_lib)
 set(common_inc)
 
@@ -121,9 +135,8 @@ else()
 endif()
 
 add_library(${PROJECT_NAME} ${effekseer_test_src})
-
 target_link_directories(${PROJECT_NAME} PUBLIC ${EFK_THIRDPARTY_LIBRARY_DIRECTORIES})
-target_include_directories(${PROJECT_NAME} PUBLIC ./ ${EFK_THIRDPARTY_INCLUDES})
+target_include_directories(${PROJECT_NAME} PUBLIC ./)
 
 if(BUILD_VULKAN)
     find_package(Vulkan REQUIRED)
diff --git a/Dev/Cpp/Viewer/CMakeLists.txt b/Dev/Cpp/Viewer/CMakeLists.txt
index a0700981ad..76d33fbe04 100644
--- a/Dev/Cpp/Viewer/CMakeLists.txt
+++ b/Dev/Cpp/Viewer/CMakeLists.txt
@@ -128,14 +128,15 @@ list(APPEND cpps ${cpps_g})
 FilterFolder("${hs}")
 FilterFolder("${cpps}")
 
-add_library(Viewer SHARED ${cpps} ${hs})
-
-target_include_directories(
-    Viewer
-    PRIVATE
+include_directories(
 	${EFK_THIRDPARTY_INCLUDES}
+	../include/
+	../EffekseerRendererGL/
+	../EffekseerSoundOSMixer/
+	../
 )
 
+add_library(Viewer SHARED ${cpps} ${hs})
 target_link_directories(
     Viewer
     PRIVATE