Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

Commit 12939d1

Browse files
committed
[Web] Update CMakeLists.txt to use bundled freetype & harfbuzz library
1 parent 5098067 commit 12939d1

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Web/App/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.0)
33
project(OpenSiv3D_Web CXX)
44
enable_language(C)
55

6-
set(CMAKE_CXX_FLAGS "-std=c++17 -Wall -Wextra -Wno-unknown-pragmas -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s ALLOW_MEMORY_GROWTH=1 -s FULL_ES3 -s USE_GLFW=3 -s USE_LIBPNG=1 -s USE_FREETYPE=1 -s USE_HARFBUZZ=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_ZLIB=1 --js-library '${CMAKE_SOURCE_DIR}/Siv3D.js' --preload-file '${CMAKE_SOURCE_DIR}/resources@/resources'")
6+
set(CMAKE_CXX_FLAGS "-std=c++17 -Wall -Wextra -Wno-unknown-pragmas -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s ALLOW_MEMORY_GROWTH=1 -s FULL_ES3 -s USE_GLFW=3 -s USE_LIBPNG=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_ZLIB=1 --js-library '${CMAKE_SOURCE_DIR}/Siv3D.js' --preload-file '${CMAKE_SOURCE_DIR}/resources@/resources'")
77
set(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 -pg -DDEBUG")
88
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
99
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g3 -Og -pg")
@@ -33,6 +33,8 @@ target_link_directories(Siv3D_App
3333
PRIVATE
3434
${PROJECT_SOURCE_DIR}/../Build
3535
${PROJECT_SOURCE_DIR}/../../Siv3D/lib/Web/opencv
36+
${PROJECT_SOURCE_DIR}/../Siv3D/lib/Web/harfbuzz
37+
${PROJECT_SOURCE_DIR}/../Siv3D/lib/Web/freetype
3638
)
3739

3840
if (SIV3D_BUILD_WITH_SHARED_WASM)
@@ -44,5 +46,7 @@ else ()
4446
libopencv_imgproc.a
4547
libopencv_objdetect.a
4648
libopencv_photo.a
49+
libfreetype.a
50+
libharfbuzz.a
4751
)
4852
endif()

Web/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g3 -Og -pg")
1616
set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
1717

1818
if (SIV3D_BUILD_SHARED_WASM)
19-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s SIDE_MODULE=1 -s FULL_ES3=1 -s USE_GLFW=3 -s USE_LIBPNG=1 -s USE_FREETYPE=1 -s USE_HARFBUZZ=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_ZLIB=1")
20-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s SIDE_MODULE=1 -s FULL_ES3=1 -s USE_GLFW=3 -s USE_LIBPNG=1 -s USE_FREETYPE=1 -s USE_HARFBUZZ=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_ZLIB=1")
19+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s SIDE_MODULE=1 -s FULL_ES3=1 -s USE_GLFW=3 -s USE_LIBPNG=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_ZLIB=1")
20+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s SIDE_MODULE=1 -s FULL_ES3=1 -s USE_GLFW=3 -s USE_LIBPNG=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_ZLIB=1")
2121

2222
set(CMAKE_EXECUTABLE_SUFFIX ".wasm")
2323
endif ()
@@ -728,13 +728,17 @@ if (SIV3D_BUILD_SHARED_WASM)
728728
target_link_directories(Siv3D
729729
PRIVATE
730730
${PROJECT_SOURCE_DIR}/../Siv3D/lib/Web/opencv
731+
${PROJECT_SOURCE_DIR}/../Siv3D/lib/Web/harfbuzz
732+
${PROJECT_SOURCE_DIR}/../Siv3D/lib/Web/freetype
731733
)
732734

733735
target_link_libraries(Siv3D
734736
libopencv_core_pic.a
735737
libopencv_imgproc_pic.a
736738
libopencv_objdetect_pic.a
737739
libopencv_photo_pic.a
740+
libfreetype_pic.a
741+
libharfbuzz_pic.a
738742
)
739743
else ()
740744
add_library(Siv3D STATIC ${SOURCE_FILES})

0 commit comments

Comments
 (0)