Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor material #947

Merged
merged 3 commits into from
Jul 20, 2023
Merged

Refactor material #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
663244c
wip
durswd Jul 14, 2023
e89d299
wip
durswd Jul 20, 2023
f8393f6
fix
durswd Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions Dev/Cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,22 +190,6 @@ if(BUILD_VIEWER)

set(BUILD_TEST_TEMP ${BUILD_TEST})
set(BUILD_TEST OFF)
add_subdirectory("3rdParty/AltseedRHI")
set_target_properties (AltseedRHI PROPERTIES FOLDER Thirdparty)
set(BUILD_TEST ${BUILD_TEST_TEMP})

if(APPLE)
add_dependencies(AltseedRHI ExternalProject_zlib ExternalProject_libpng)
else()
add_dependencies(AltseedRHI ExternalProject_glew)
endif()

target_include_directories(
AltseedRHI
PRIVATE
${EFK_THIRDPARTY_INCLUDES}
)

add_subdirectory("EffekseerMaterial")
set_property(TARGET EffekseerMaterial PROPERTY FOLDER Libraries)
add_subdirectory("EffekseerMaterialEditor")
Expand Down
18 changes: 6 additions & 12 deletions Dev/Cpp/EffekseerMaterialEditor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ if(WIN32)
add_dependencies(EffekseerMaterialEditor ExternalProject_glew ExternalProject_glfw)
endif()

target_compile_definitions(EffekseerMaterialEditor PRIVATE NOMINMAX)

target_include_directories(
EffekseerMaterialEditor
PRIVATE
${EFK_THIRDPARTY_INCLUDES}
../include/
${PROJECT_SOURCE_DIR}/../3rdParty/AltseedRHI/include/
../EffekseerMaterial/
ThirdParty/picojson/)

Expand All @@ -63,15 +64,17 @@ target_link_directories(
target_link_libraries(
EffekseerMaterialEditor
PRIVATE
Effekseer
EffekseerRendererGL
EffekseerMaterial
EditorCommon
AltseedRHI
Boxer
nfd
imgui
imgui_platform
imgui-node-editor
ImGradientHDR
IPC
)

if(USE_LIBPNG_LOADER)
Expand All @@ -97,9 +100,6 @@ if (WIN32)
target_link_libraries(
EffekseerMaterialEditor
PRIVATE
Effekseer # to use shader loader
EffekseerRendererGL # to use shader loader
IPC
debug libglew32d
optimized libglew32)

Expand All @@ -118,9 +118,6 @@ find_library(CORE_VIDEO_FRAMEWORK CoreVideo)
target_link_libraries(
EffekseerMaterialEditor
PRIVATE
Effekseer # to use shader loader
EffekseerRendererGL # to use shader loader
IPC
${CMAKE_THREAD_LIBS_INIT}
${COCOA_FRAMEWORK}
${OPENGL_LIBRARIES}
Expand All @@ -147,9 +144,6 @@ include_directories(
target_link_libraries(
EffekseerMaterialEditor
PRIVATE
Effekseer # to use shader loader
EffekseerRendererGL # to use shader loader
IPC
dl
stdc++fs
${CMAKE_THREAD_LIBS_INIT}
Expand All @@ -160,7 +154,7 @@ endif()

set_target_properties(EffekseerMaterialEditor PROPERTIES LINKER_LANGUAGE CXX)

set(files ${hs} ${srcs} ${srcs_third_imgui_platform})
set(files ${hs} ${srcs})

set(files ${srcs} ${hs})

Expand Down
Loading
Loading