This repository was archived by the owner on Aug 21, 2024. It is now read-only.
File tree 2 files changed +11
-3
lines changed
2 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.0)
3
3
project (OpenSiv3D_Web CXX)
4
4
enable_language (C)
5
5
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'" )
7
7
set (CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 -pg -DDEBUG" )
8
8
set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" )
9
9
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g3 -Og -pg" )
@@ -33,6 +33,8 @@ target_link_directories(Siv3D_App
33
33
PRIVATE
34
34
${PROJECT_SOURCE_DIR} /../Build
35
35
${PROJECT_SOURCE_DIR} /../../Siv3D/lib/Web/opencv
36
+ ${PROJECT_SOURCE_DIR} /../Siv3D/lib/Web/harfbuzz
37
+ ${PROJECT_SOURCE_DIR} /../Siv3D/lib/Web/freetype
36
38
)
37
39
38
40
if (SIV3D_BUILD_WITH_SHARED_WASM)
@@ -44,5 +46,7 @@ else ()
44
46
libopencv_imgproc.a
45
47
libopencv_objdetect.a
46
48
libopencv_photo.a
49
+ libfreetype.a
50
+ libharfbuzz.a
47
51
)
48
52
endif ()
Original file line number Diff line number Diff line change @@ -16,8 +16,8 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g3 -Og -pg")
16
16
set (CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG" )
17
17
18
18
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" )
21
21
22
22
set (CMAKE_EXECUTABLE_SUFFIX ".wasm" )
23
23
endif ()
@@ -728,13 +728,17 @@ if (SIV3D_BUILD_SHARED_WASM)
728
728
target_link_directories (Siv3D
729
729
PRIVATE
730
730
${PROJECT_SOURCE_DIR} /../Siv3D/lib/Web/opencv
731
+ ${PROJECT_SOURCE_DIR} /../Siv3D/lib/Web/harfbuzz
732
+ ${PROJECT_SOURCE_DIR} /../Siv3D/lib/Web/freetype
731
733
)
732
734
733
735
target_link_libraries (Siv3D
734
736
libopencv_core_pic.a
735
737
libopencv_imgproc_pic.a
736
738
libopencv_objdetect_pic.a
737
739
libopencv_photo_pic.a
740
+ libfreetype_pic.a
741
+ libharfbuzz_pic.a
738
742
)
739
743
else ()
740
744
add_library (Siv3D STATIC ${SOURCE_FILES} )
You can’t perform that action at this time.
0 commit comments