Skip to content
Draft
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
22 changes: 19 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 3.13...4.0)

if(CMAKE_CONFIGURATION_TYPES)
set(CMAKE_CONFIGURATION_TYPES "Release")
set(CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo")
endif()

set(CMAKE_CXX_STANDARD 20)
Expand Down Expand Up @@ -169,8 +169,11 @@ check_exists(CEF_DLL_LIBRARY)
# 4505 "unreferenced local function has been removed" - supress meaningless freeglut warning
if(IS_WINDOWS)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -W4 -wd4100 -wd4127 -wd4505")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -W4 -wd4100 -wd4127 -wd4505")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG:FULL")
elseif(IS_MACOS)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -xobjective-c++")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -xobjective-c++")
elseif(IS_LINUX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-array-bounds")
endif()
Expand Down Expand Up @@ -199,12 +202,15 @@ add_library(
src/dullahan_debug.h
src/dullahan_impl.cpp
src/dullahan_impl.h
src/dullahan_platform_utils.h
src/dullahan_version.h
src/dullahan_version.h.in
${KEYBOARD_IMPL_SRC_FILE}
src/dullahan_impl_mouse.cpp
src/dullahan_render_handler.cpp
src/dullahan_render_handler.h
src/dullahan_shared_texture_flipper.cpp
src/dullahan_shared_texture_flipper.h
)

# define which include directories to pull in
Expand All @@ -218,6 +224,11 @@ target_include_directories(
# turn off spurious linker warnings
if(IS_WINDOWS)
set_target_properties(dullahan PROPERTIES LINK_FLAGS "/ignore:4099")

# the accelerated-paint flip (dullahan_shared_texture_flipper) does its GPU
# work with D3D11/DXGI and compiles its shaders at runtime with d3dcompiler.
# PUBLIC so these propagate to anything linking the (static) dullahan lib.
target_link_libraries(dullahan PUBLIC d3d11 dxgi dxguid d3dcompiler)
endif()

###############################################################################
Expand Down Expand Up @@ -259,6 +270,7 @@ if(IS_WINDOWS)
target_include_directories(
dullahan_host
PUBLIC
${CMAKE_SOURCE_DIR}/src
${CEF_INCLUDE_DIR}
${CEF_INCLUDE_DIR}/..
)
Expand Down Expand Up @@ -313,6 +325,7 @@ elseif(IS_MACOS)
target_include_directories(
${_helper_target}
PUBLIC
${CMAKE_SOURCE_DIR}/src
${CEF_INCLUDE_DIR}
${CEF_INCLUDE_DIR}/..
)
Expand All @@ -330,6 +343,7 @@ elseif(IS_LINUX)
target_include_directories(
dullahan_host
PUBLIC
${CMAKE_SOURCE_DIR}/src
${CEF_INCLUDE_DIR}
${CEF_INCLUDE_DIR}/..
)
Expand All @@ -348,7 +362,7 @@ if(IS_WINDOWS)
add_custom_command(
TARGET dullahan_host POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory
"$<$<CONFIG:release>:${CEF_RELEASE_BIN_DIR}>"
"$<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:${CEF_RELEASE_BIN_DIR}>"
"$<TARGET_FILE_DIR:dullahan_host>"
COMMENT "Copying runtime files to executable directory")

Expand Down Expand Up @@ -408,6 +422,8 @@ if (BUILD_EXAMPLES)
dullahan
opengl32
comctl32
d3d11
dxgi
${CEF_LIBRARY}
${CEF_DLL_LIBRARY}
${THIRD-PARTY-PREFIX}/${GLFW_FOLDER}/${GLFW_LIB_PATH}
Expand Down Expand Up @@ -448,7 +464,7 @@ if (BUILD_EXAMPLES)
endif()

if(CMAKE_CONFIGURATION_TYPES)
set(CMAKE_CONFIGURATION_TYPES "Release")
set(CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo")
endif()

# Install the Dullahan library and host executable
Expand Down
10 changes: 5 additions & 5 deletions autobuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>3218ee0b5acc5e3fa4d5e9e9e24929b9913688ad</string>
<string>dbf4ae3aa5627261588e1e866c942d40686ac6c8</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.us-east-1.amazonaws.com/gh/secondlife/cef/cef_bin-148.0.9_g0d9d52a_chromium-148.0.7778.180-darwin64-261471908.tar.zst</string>
<string>https://automated-builds-secondlife-com.s3.us-east-1.amazonaws.com/gh/secondlife/cef/cef_bin-150.0.11_gb887805_chromium-150.0.7871.115-darwin64-261901938.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -33,18 +33,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f677be20cd859b2a7cf6925cf60bd6ab4829266a</string>
<string>1900ee8ae7c67abf1c9ddb9fea7c540b4ac2ff6d</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.us-east-1.amazonaws.com/gh/secondlife/cef/cef_bin-148.0.9_g0d9d52a_chromium-148.0.7778.180-windows64-261470050.tar.zst</string>
<string>https://automated-builds-secondlife-com.s3.us-east-1.amazonaws.com/gh/secondlife/cef/cef_bin-150.0.11_gb887805_chromium-150.0.7871.115-windows64-261901728.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>cef_bin-148.0.9_g0d9d52a_chromium-148.0.7778.180</string>
<string>cef_bin-150.0.11_gb887805_chromium-150.0.7871.115</string>
</map>
</map>
<key>package_description</key>
Expand Down
Loading
Loading