Revert "fix"

This reverts commit c9fd28d.
effekseer · Oct 25, 2023 · cebc974 · cebc974
1 parent 2cb183a
commit cebc974
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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