Fix compile

effekseer · Aug 5, 2022 · eafe597 · eafe597
1 parent 50e4813
commit eafe597
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 37 deletions.
diff --git a/Dev/Cpp/EffekseerRendererDX11/CMakeLists.txt b/Dev/Cpp/EffekseerRendererDX11/CMakeLists.txt
@@ -12,15 +12,6 @@ list(APPEND LOCAL_SOURCES_Common
 
 source_group("EffekseerRendererCommon" FILES ${LOCAL_SOURCES_Common})
 
-if(NOT USE_INTERNAL_LOADER)
-    list(REMOVE_ITEM LOCAL_SOURCES_Common
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.DXTK.DDSTextureLoader.cpp
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.DXTK.DDSTextureLoader.h
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h
-    )
-endif()
-
 file(GLOB_RECURSE LOCAL_HEADERS_DX11 *.h)
 file(GLOB_RECURSE LOCAL_SOURCES_DX11 *.cpp)
 list(APPEND LOCAL_HEADERS_DX11 ../EffekseerMaterialCompiler/DirectX11/EffekseerMaterialCompilerDX11.h)
@@ -51,7 +42,7 @@ if(CLANG_FORMAT_ENABLED)
     clang_format(${PROJECT_NAME})
 endif()
 
-if(USE_LIBPNG_LOADER AND USE_INTERNAL_LOADER)
+if(USE_LIBPNG_LOADER)
     add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng) 
 endif()
 

diff --git a/Dev/Cpp/EffekseerRendererDX12/CMakeLists.txt b/Dev/Cpp/EffekseerRendererDX12/CMakeLists.txt
@@ -48,7 +48,7 @@ endif()
 
 WarnError(${PROJECT_NAME})
 
-if(USE_LIBPNG_LOADER AND USE_INTERNAL_LOADER)
+if(USE_LIBPNG_LOADER)
     add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng) 
 endif()
 

diff --git a/Dev/Cpp/EffekseerRendererDX9/CMakeLists.txt b/Dev/Cpp/EffekseerRendererDX9/CMakeLists.txt
@@ -12,15 +12,6 @@ list(APPEND LOCAL_SOURCES_Common
 
 source_group("EffekseerRendererCommon" FILES ${LOCAL_SOURCES_Common})
 
-if(NOT USE_INTERNAL_LOADER)
-    list(REMOVE_ITEM LOCAL_SOURCES_Common
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.DXTK.DDSTextureLoader.cpp
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.DXTK.DDSTextureLoader.h
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h
-    )
-endif()
-
 file(GLOB_RECURSE LOCAL_HEADERS_DX9 *.h)
 file(GLOB_RECURSE LOCAL_SOURCES_DX9 *.cpp)
 list(APPEND LOCAL_HEADERS_DX9 ../EffekseerMaterialCompiler/DirectX9/EffekseerMaterialCompilerDX9.h)
@@ -51,7 +42,7 @@ if(CLANG_FORMAT_ENABLED)
     clang_format(${PROJECT_NAME})
 endif()
 
-if(USE_LIBPNG_LOADER AND USE_INTERNAL_LOADER)
+if(USE_LIBPNG_LOADER)
     add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng) 
 endif()
 

diff --git a/Dev/Cpp/EffekseerRendererGL/CMakeLists.txt b/Dev/Cpp/EffekseerRendererGL/CMakeLists.txt
@@ -17,12 +17,10 @@ list(REMOVE_ITEM LOCAL_SOURCES_Common
     ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.DXTK.DDSTextureLoader.h
 )
 
-if(NOT USE_INTERNAL_LOADER)
-    list(REMOVE_ITEM LOCAL_SOURCES_Common
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h
-    )
-endif()
+list(REMOVE_ITEM LOCAL_SOURCES_Common
+    ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp
+    ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h
+)
 
 file(GLOB_RECURSE LOCAL_HEADERS_GL *.h)
 file(GLOB_RECURSE LOCAL_SOURCES_GL *.cpp)
@@ -54,7 +52,7 @@ if(CLANG_FORMAT_ENABLED)
     clang_format(${PROJECT_NAME})
 endif()
 
-if(USE_LIBPNG_LOADER AND USE_INTERNAL_LOADER)
+if(USE_LIBPNG_LOADER)
     add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng) 
 endif()
 

diff --git a/Dev/Cpp/EffekseerRendererMetal/CMakeLists.txt b/Dev/Cpp/EffekseerRendererMetal/CMakeLists.txt
@@ -21,13 +21,6 @@ list(REMOVE_ITEM LOCAL_SOURCES_Common
   ${CMAKE_CURRENT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.DXTK.DDSTextureLoader.cpp
 )
 
-if(NOT USE_INTERNAL_LOADER)
-    list(REMOVE_ITEM LOCAL_SOURCES_Common
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.cpp
-        ${PROJECT_SOURCE_DIR}/../EffekseerRendererCommon/EffekseerRenderer.PngTextureLoader.h
-    )
-endif()
-
 source_group("EffekseerRendererCommon" FILES ${LOCAL_SOURCES_Common})
 
 file(GLOB_RECURSE LOCAL_HEADERS_Metal *.h)
@@ -57,7 +50,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${LOCAL_HEADERS_Metal}")
 target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer LLGI)
 
-if(USE_LIBPNG_LOADER AND USE_INTERNAL_LOADER)
+if(USE_LIBPNG_LOADER)
     add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng) 
 endif()
 

diff --git a/Dev/Cpp/EffekseerRendererVulkan/CMakeLists.txt b/Dev/Cpp/EffekseerRendererVulkan/CMakeLists.txt
@@ -44,7 +44,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${Vulkan_INCLUDE_DIRS})
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${LOCAL_HEADERS_Vulkan}")
 target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer LLGI)
 
-if(USE_LIBPNG_LOADER AND USE_INTERNAL_LOADER)
+if(USE_LIBPNG_LOADER)
     add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng) 
 endif()