Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ function(AddApplication)
set_property(TARGET ${A_Target}-objects APPEND PROPERTY COMPILE_OPTIONS ${A_Flags})
set_property(TARGET ${A_Target}-objects APPEND PROPERTY INCLUDE_DIRECTORIES ${ENGINE_DIR} ${MOUNT_DIR} ${LIB_DIR})
set_property(TARGET ${A_Target}-objects APPEND PROPERTY COMPILE_DEFINITIONS ${A_Definitions})

set_target_properties(${A_Target}-objects PROPERTIES FOLDER "engine/objects")

set(Sources WIN32 ${A_ApplicationMain})
Expand Down Expand Up @@ -973,25 +973,31 @@ if (BUILD_CLIENT)
set(SHADERS_CPP_TEXT "// This file is auto-generated by CMakeLists.txt.\n")
string(APPEND SHADERS_CPP_TEXT "#include \"common/Common.h\"\n\n")
set(SHADERMAP_TEXT "")

foreach(res ${GLSLSOURCELIST})
get_filename_component(filename_no_ext ${res} NAME_WE)
set(outpath ${EMBED_INCLUDE_DIR}/${filename_no_ext}.glsl.h)

add_custom_command(
OUTPUT ${outpath}
COMMAND ${CMAKE_COMMAND} "-DINPUT_FILE=${res}" "-DOUTPUT_FILE=${outpath}"
"-DVARIABLE_NAME=${filename_no_ext}_glsl" -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedText.cmake
MAIN_DEPENDENCY ${res}
)

set_property(TARGET client-objects APPEND PROPERTY SOURCES ${outpath})
string(APPEND SHADERS_CPP_TEXT "#include \"../embed_data/${filename_no_ext}.glsl.h\"\n")
string(APPEND SHADERMAP_TEXT "\t{ \"${filename_no_ext}.glsl\", ")
string(APPEND SHADERMAP_TEXT "std::string(reinterpret_cast<const char *>( ${filename_no_ext}_glsl ), ")
string(APPEND SHADERMAP_TEXT "sizeof( ${filename_no_ext}_glsl )) },\n")

string(APPEND SHADERS_CPP_TEXT "#include \"../embed_data/${filename_no_ext}.glsl.h\"\n")
string(APPEND SHADERMAP_TEXT "\t{ \"${filename_no_ext}.glsl\", ")
string(APPEND SHADERMAP_TEXT "std::string(reinterpret_cast<const char *>( ${filename_no_ext}_glsl ), ")
string(APPEND SHADERMAP_TEXT "sizeof( ${filename_no_ext}_glsl )) },\n")
endforeach()

string(APPEND SHADERS_CPP_TEXT "\nextern const std::unordered_map<std::string, std::string> shadermap\n{\n")
string(APPEND SHADERS_CPP_TEXT "${SHADERMAP_TEXT}")
string(APPEND SHADERS_CPP_TEXT "};\n")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/GeneratedSource/shaders.cpp" "${SHADERS_CPP_TEXT}")

daemon_write_generated("shaders.cpp" "${SHADERS_CPP_TEXT}")
endif()

if (BUILD_SERVER)
Expand Down
41 changes: 24 additions & 17 deletions cmake/DaemonBuildInfo.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
set(DAEMON_BUILDINFO_HEADER "// Automatically generated, do not modify!\n")
set(DAEMON_BUILDINFO_PARENT "${CMAKE_CURRENT_BINARY_DIR}/GeneratedSource")
set(DAEMON_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/GeneratedSource")

set(DAEMON_BUILDINFO_DIR "DaemonBuildInfo")
set(DAEMON_BUILDINFO_DIR_FULLPATH "${DAEMON_BUILDINFO_PARENT}/${DAEMON_BUILDINFO_DIR}")
set(DAEMON_BUILDINFO_HEADER "// Automatically generated, do not modify!\n")
set(DAEMON_BUILDINFO_CPP_EXT ".cpp")
set(DAEMON_BUILDINFO_H_EXT ".h")
set(BUILDINFOLIST)

file(MAKE_DIRECTORY "${DAEMON_BUILDINFO_DIR_FULLPATH}")
include_directories("${DAEMON_BUILDINFO_PARENT}")
file(MAKE_DIRECTORY "${DAEMON_GENERATED_DIR}")
include_directories("${DAEMON_GENERATED_DIR}")

file(MAKE_DIRECTORY "${DAEMON_GENERATED_DIR}/${DAEMON_BUILDINFO_DIR}")

foreach(kind CPP H)
set(DAEMON_BUILDINFO_${kind} "${DAEMON_BUILDINFO_HEADER}")
Expand All @@ -18,20 +20,25 @@ macro(daemon_add_buildinfo TYPE NAME VALUE)
set(DAEMON_BUILDINFO_H "${DAEMON_BUILDINFO_H}extern const ${TYPE} ${NAME};\n")
endmacro()

macro(daemon_write_generated GENERATED_PATH GENERATED_CONTENT)
set(DAEMON_GENERATED_FILE ${DAEMON_GENERATED_DIR}/${GENERATED_PATH})

if (EXISTS "${DAEMON_GENERATED_FILE}")
file(READ "${DAEMON_GENERATED_FILE}" GENERATED_CONTENT_READ)
endif()

if (NOT "${GENERATED_CONTENT}" STREQUAL "${GENERATED_CONTENT_READ}")
message(STATUS "Generating ${GENERATED_PATH}")
file(WRITE "${DAEMON_GENERATED_FILE}" "${GENERATED_CONTENT}")
endif()
endmacro()

macro(daemon_write_buildinfo NAME)
foreach(kind CPP H)
set(DAEMON_BUILDINFO_${kind}_NAME "${NAME}${DAEMON_BUILDINFO_${kind}_EXT}")
set(DAEMON_BUILDINFO_${kind}_FILE "${DAEMON_BUILDINFO_DIR}/${DAEMON_BUILDINFO_${kind}_NAME}")
set(DAEMON_BUILDINFO_${kind}_FILE_FULLPATH "${DAEMON_BUILDINFO_PARENT}/${DAEMON_BUILDINFO_${kind}_FILE}")
list(APPEND BUILDINFOLIST "${DAEMON_BUILDINFO_${kind}_FILE_FULLPATH}")

if (EXISTS "${DAEMON_BUILDINFO_${kind}_FILE_FULLPATH}")
file(READ "${DAEMON_BUILDINFO_${kind}_FILE_FULLPATH}" DAEMON_BUILDINFO_${kind}_READ)
endif()

if (NOT "${DAEMON_BUILDINFO_${kind}}" STREQUAL "${DAEMON_BUILDINFO_${kind}_READ}")
message(STATUS "Generating ${DAEMON_BUILDINFO_${kind}_FILE}")
file(WRITE "${DAEMON_BUILDINFO_${kind}_FILE_FULLPATH}" "${DAEMON_BUILDINFO_${kind}}")
endif()
set(DAEMON_BUILDINFO_${kind}_PATH "${DAEMON_BUILDINFO_DIR}/${DAEMON_BUILDINFO_${kind}_NAME}")

daemon_write_generated("${DAEMON_BUILDINFO_${kind}_PATH}" "${DAEMON_BUILDINFO_${kind}}")
list(APPEND BUILDINFOLIST "${DAEMON_GENERATED_FILE}")
endforeach()
endmacro()
2 changes: 1 addition & 1 deletion src.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ set(COMMONTESTLIST
)

set(RENDERERLIST
${CMAKE_CURRENT_BINARY_DIR}/GeneratedSource/shaders.cpp
${DAEMON_GENERATED_DIR}/shaders.cpp
${ENGINE_DIR}/renderer/BufferBind.h
${ENGINE_DIR}/renderer/DetectGLVendors.cpp
${ENGINE_DIR}/renderer/DetectGLVendors.h
Expand Down