Skip to content

Commit da87214

Browse files
committed
examples の sdl_sample と messaging_recvonly_sample のターゲット別ディレクトリを削除し CMakeLists.txt を修正する
- ターゲット別ディレクトリ(macos_arm64, ubuntu-*, windows_x86_64)を削除 - トップレベルの CMakeLists.txt で Windows 向け設定を完全化 - /bigobj フラグを追加 - Windows マクロ定義(_CONSOLE, _WIN32_WINNT, NOMINMAX, WIN32_LEAN_AND_MEAN)を追加 - Threads パッケージを非 Windows でのみ検索 これで 3 つのサンプル全てが sumomo と同じ構成に統一される。
1 parent c8b7a41 commit da87214

File tree

26 files changed

+28
-3064
lines changed

26 files changed

+28
-3064
lines changed

examples/messaging_recvonly_sample/CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ endif()
2525
find_package(Boost REQUIRED COMPONENTS json filesystem)
2626
find_package(WebRTC REQUIRED)
2727
find_package(Sora REQUIRED)
28-
find_package(Threads REQUIRED)
28+
if(NOT WIN32)
29+
find_package(Threads REQUIRED)
30+
endif()
2931

3032
add_executable(messaging_recvonly_sample)
3133
set_target_properties(messaging_recvonly_sample PROPERTIES CXX_STANDARD 20 C_STANDARD 20)
@@ -40,12 +42,22 @@ if(NOT WIN32)
4042
"$<$<COMPILE_LANGUAGE:CXX>:-isystem${LIBCXX_INCLUDE_DIR}>"
4143
)
4244
else()
43-
target_compile_options(messaging_recvonly_sample PRIVATE /utf-8)
45+
target_compile_options(messaging_recvonly_sample PRIVATE /utf-8 /bigobj)
4446
set_target_properties(messaging_recvonly_sample
4547
PROPERTIES
4648
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
4749
)
4850
endif()
4951
target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include)
5052
target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora)
53+
5154
target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0)
55+
if(WIN32)
56+
target_compile_definitions(messaging_recvonly_sample
57+
PRIVATE
58+
_CONSOLE
59+
_WIN32_WINNT=0x0A00
60+
NOMINMAX
61+
WIN32_LEAN_AND_MEAN
62+
)
63+
endif()

examples/messaging_recvonly_sample/macos_arm64/CMakeLists.txt

Lines changed: 0 additions & 40 deletions
This file was deleted.

examples/messaging_recvonly_sample/macos_arm64/run.py

Lines changed: 0 additions & 204 deletions
This file was deleted.

examples/messaging_recvonly_sample/ubuntu-22.04_armv8/CMakeLists.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)