kyush/principia
1
0
Fork 0
forked from mirrors/principia
Code Pull requests Activity Actions

Use Emscripten ports for all web dependencies & disable cURL

Browse source
This commit is contained in:
ROllerozxa 2025-03-10 23:21:07 +01:00
commit 4e6f127a91
2 changed files with 28 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

55
CMakeLists.txt
View file

@ -33,18 +33,18 @@ if(ANDROID)
else() else()
if(NOT EMSCRIPTEN) if(NOT EMSCRIPTEN)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
else()
include(PrincipiaEmscriptenLibs)
endif() endif()
set(OpenGL_GL_PREFERENCE GLVND) set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
endif() endif()
find_package(Freetype REQUIRED) if(NOT EMSCRIPTEN)
find_package(JPEG REQUIRED) find_package(Freetype REQUIRED)
find_package(PNG REQUIRED) find_package(JPEG REQUIRED)
find_package(ZLIB REQUIRED) find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
endif()
# Determine platform and backend # Determine platform and backend
@ -140,13 +140,14 @@ if(NOT SCREENSHOT_BUILD)
endif() endif()
endif() endif()
find_package(CURL REQUIRED) if(NOT EMSCRIPTEN)
include_directories(${CURL_INCLUDE_DIR}) find_package(CURL REQUIRED)
include_directories(${CURL_INCLUDE_DIR})
add_definitions(-DBUILD_CURL)
endif()
file(GLOB SDL_mixer_SRCS lib/SDL_mixer/*.c) file(GLOB SDL_mixer_SRCS lib/SDL_mixer/*.c)
list(APPEND SRCS ${SDL_mixer_SRCS}) list(APPEND SRCS ${SDL_mixer_SRCS})
add_definitions(-DBUILD_CURL)
endif() endif()
@ -198,29 +199,28 @@ endif()
# Link libraries against executable # Link libraries against executable
# --------------------------------- # ---------------------------------
set(LIBS
Freetype::Freetype
JPEG::JPEG
PNG::PNG
ZLIB::ZLIB
)
if(NOT EMSCRIPTEN) if(NOT EMSCRIPTEN)
set(LIBS
Freetype::Freetype
JPEG::JPEG
PNG::PNG
ZLIB::ZLIB)
if(WIN32) if(WIN32)
list(APPEND LIBS SDL2::SDL2main) list(APPEND LIBS SDL2::SDL2main)
endif() endif()
list(APPEND LIBS SDL2::SDL2) list(APPEND LIBS SDL2::SDL2)
endif()
if(NOT SCREENSHOT_BUILD) if(NOT SCREENSHOT_BUILD AND NOT EMSCRIPTEN)
list(APPEND LIBS ${CURL_LIBRARIES}) list(APPEND LIBS ${CURL_LIBRARIES})
if(NOT ANDROID) if(NOT ANDROID)
list(APPEND LIBS ${GTK3_LIBRARIES}) list(APPEND LIBS ${GTK3_LIBRARIES})
endif() endif()
if(NOT SHOULD_USE_GLES) if(NOT SHOULD_USE_GLES)
list(APPEND LIBS GLEW::GLEW) list(APPEND LIBS GLEW::GLEW)
endif()
endif() endif()
endif() endif()
@ -272,8 +272,9 @@ set(COMMON_FLAGS "-fno-math-errno -fno-trapping-math -fno-signed-zeros")
if(EMSCRIPTEN) if(EMSCRIPTEN)
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "--preload-file ../data/") set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "--preload-file ../data/")
string(APPEND COMMON_FLAGS " -sUSE_SDL=2 -pthread") set(LIBRARY_FLAGS "-sUSE_FREETYPE=1 -sUSE_LIBJPEG=1 -sUSE_LIBPNG=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -pthread")
set(CMAKE_EXE_LINKER_FLAGS " -sUSE_SDL=2 -pthread -sPTHREAD_POOL_SIZE=20 -sINITIAL_MEMORY=2013265920 -sALLOW_MEMORY_GROWTH=1 -sTOTAL_STACK=16Mb") string(APPEND COMMON_FLAGS " ${LIBRARY_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS " ${LIBRARY_FLAGS} -pthread -sPTHREAD_POOL_SIZE=20 -sINITIAL_MEMORY=2013265920 -sALLOW_MEMORY_GROWTH=1 -sTOTAL_STACK=16Mb")
set(CMAKE_EXECUTABLE_SUFFIX ".html") set(CMAKE_EXECUTABLE_SUFFIX ".html")
endif() endif()

13
cmake/Modules/PrincipiaEmscriptenLibs.cmake
View file

@ -1,13 +0,0 @@
set(DEPS "${CMAKE_SOURCE_DIR}/build_web/deps/")
set(CURL_INCLUDE_DIR ${DEPS}/include/curl)
set(CURL_LIBRARY ${DEPS}/lib/libcurl.a;${DEPS}/lib/libcrypto.a;${DEPS}/lib/libemsocket.a;${DEPS}/lib/libssl.a)
set(FREETYPE_INCLUDE_DIR_ft2build ${DEPS}/include/freetype2)
set(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR_ft2build}/freetype)
set(FREETYPE_LIBRARY ${DEPS}/lib/libfreetype.a)
set(JPEG_INCLUDE_DIR ${DEPS}/include)
set(JPEG_LIBRARY ${DEPS}/lib/libjpeg.a)
set(PNG_PNG_INCLUDE_DIR ${DEPS}/include/libpng16) #what
set(PNG_LIBRARY ${DEPS}/lib/libpng16.a)
set(ZLIB_INCLUDE_DIR ${DEPS}/include)
set(ZLIB_LIBRARY ${DEPS}/lib/libz.a)