lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Compare commits

base: lisyarus:c2196d7dc8c7dd5fc73e125b8e88486223d97b2a
Branches Tags
lisyarus:master
..
compare: lisyarus:04cde8059653283097e9b16f2dd72f216b789ff5
Branches Tags
lisyarus:master

No commits in common. "c2196d7dc8c7dd5fc73e125b8e88486223d97b2a" and "04cde8059653283097e9b16f2dd72f216b789ff5" have entirely different histories.
c2196d7dc8 ... 04cde80596

4 changed files with 4 additions and 14 deletions
Show stats Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -86,9 +86,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Emscripten)
set(PSEMEK_PACKAGE_AS_LIBRARY OFF CACHE INTERNAL "Build applications as shared libraries")
list(APPEND PSEMEK_DEFINITIONS "-DPSEMEK_GLES=1")
list(APPEND PSEMEK_CXX_FLAGS -sUSE_SDL=2 -fexperimental-library)
if(PSEMEK_USE_FREETYPE)
list(APPEND PSEMEK_CXX_FLAGS -sUSE_FREETYPE=1)
endif()
# by default emcc doesn't produce catch clauses, but psemek is designed around exceptions
list(APPEND PSEMEK_CXX_FLAGS -sDISABLE_EXCEPTION_CATCHING=0)
if(CMAKE_BUILD_TYPE STREQUAL Debug)

5
libs/fonts/CMakeLists.txt
View file

@ -4,10 +4,7 @@ file(GLOB_RECURSE PSEMEK_FONTS_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "s
list(REMOVE_ITEM PSEMEK_FONTS_SOURCES "source/freetype.cpp")
if(PSEMEK_USE_FREETYPE)
if(NOT PSEMEK_PLATFORM_WEB)
# Emscripten provides Freetype on web
find_package(Freetype REQUIRED)
endif()
find_package(Freetype REQUIRED)
list(APPEND PSEMEK_FONTS_SOURCES "source/freetype.cpp")
endif()

8
package/CMakeLists.txt
View file

@ -8,10 +8,7 @@ if(PSEMEK_PACKAGE_MODE)
set(PSEMEK_PACKAGE_LINK_FLAGS_RAW)
if(PSEMEK_PLATFORM_WEB)
list(APPEND PSEMEK_PACKAGE_LINK_FLAGS_RAW -sUSE_SDL=2 -sUSE_FREETYPE=1 -sMIN_WEBGL_VERSION=2 -sNO_DISABLE_EXCEPTION_CATCHING -sFULL_ES3 -sWASMFS -sALLOW_MEMORY_GROWTH -sGROWABLE_ARRAYBUFFERS=0 -sASYNCIFY)
if(PSEMEK_USE_FREETYPE)
list(APPEND PSEMEK_PACKAGE_LINK_FLAGS_RAW -sUSE_FREETYPE=1)
endif()
list(APPEND PSEMEK_PACKAGE_LINK_FLAGS_RAW -sUSE_SDL=2 -sMIN_WEBGL_VERSION=2 -sNO_DISABLE_EXCEPTION_CATCHING -sFULL_ES3 -sWASMFS -sALLOW_MEMORY_GROWTH -sGROWABLE_ARRAYBUFFERS=0 -sASYNCIFY)
list(APPEND PSEMEK_PACKAGE_LINK_FLAGS_RAW "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE='$autoResumeAudioContext','$dynCall'")
if(CMAKE_BUILD_TYPE STREQUAL Debug)
list(APPEND PSEMEK_PACKAGE_LINK_FLAGS_RAW "-g")
@ -219,8 +216,7 @@ function(psemek_package_files_impl target as_resources)
COMMAND ${PSEMEK_COPY_FILES} ${ARGN}
)
elseif(PSEMEK_PLATFORM_WEB AND as_resources)
file(GLOB_RECURSE _FILES RELATIVE "${CMAKE_CURRENT_LIST_DIR}" ${ARGN})
foreach(_FILE IN LISTS _FILES)
foreach(_FILE IN LISTS ARGN)
target_link_options(${target} PRIVATE
"--preload-file=${CMAKE_CURRENT_LIST_DIR}/${_FILE}@/resources/${_FILE}"
)

2
package/web/Dockerfile
View file

@ -6,7 +6,7 @@ RUN git clone --branch 6.0.2 https://github.com/emscripten-core/emsdk.git
WORKDIR /home/emsdk
RUN ./emsdk install 6.0.2
RUN ./emsdk activate 6.0.2
RUN . ./emsdk_env.sh && embuilder build sdl2 sdl2-mt zlib freetype
RUN . ./emsdk_env.sh && embuilder build sdl2 sdl2-mt
WORKDIR /home
COPY env-helper.sh .