From af0ff04c1fc640ce965783e0962bb48358a60aea Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 4 Jun 2025 23:34:22 +0200 Subject: [PATCH 1/3] Update CMakeLists.txt Co-authored-by: Anonymous Maarten --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49f00119..ff70f474 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if (EMSCRIPTEN) add_compile_options("$<$:-pthread>") add_link_options("$<$:-sALLOW_MEMORY_GROWTH=1>") add_link_options("$<$:-sMAXIMUM_MEMORY=2gb>") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread -sUSE_PTHREADS=1 -sPROXY_TO_PTHREAD=1 -sPTHREAD_POOL_SIZE_STRICT=0 -sFORCE_FILESYSTEM=1 -sWASMFS=1 -sEXIT_RUNTIME=1") + add_link_options(-sUSE_PTHREADS=1 -sPROXY_TO_PTHREAD=1 -sPTHREAD_POOL_SIZE_STRICT=0 -sFORCE_FILESYSTEM=1 -sWASMFS=1 -sEXIT_RUNTIME=1) set(SDL_PTHREADS ON CACHE BOOL "Enable SDL pthreads" FORCE) endif() From 2ce966b3a8ba4b17be24d2e63886eef2eb837a66 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 4 Jun 2025 23:34:40 +0200 Subject: [PATCH 2/3] Update CMakeLists.txt Co-authored-by: Anonymous Maarten --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff70f474..9740395b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ option(ENABLE_CLANG_TIDY "Enable clang-tidy") option(DOWNLOAD_DEPENDENCIES "Download dependencies" ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" CACHE PATH "Directory where to put executables and dll") set(ISLE_EMSCRIPTEN_HOST "" CACHE STRING "Host URL for Emscripten streaming (e.g., https://test.com)") +cmake_dependent_option(BUILD_SHARED_LIBS "Build lego1 as a shared library" ON "NOT EMSCRIPTEN" OFF) message(STATUS "Isle app: ${ISLE_BUILD_APP}") message(STATUS "Config app: ${ISLE_BUILD_CONFIG}") From dcf39b6ae9aec12c986aa2c3c9e3d4ae36c46ed5 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 4 Jun 2025 23:34:46 +0200 Subject: [PATCH 3/3] Update CMakeLists.txt Co-authored-by: Anonymous Maarten --- CMakeLists.txt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9740395b..17e6426d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,16 +142,9 @@ target_link_directories(DirectX5::DirectX5 INTERFACE "${CMAKE_SOURCE_DIR}/3rdpar add_library(Vec::Vec INTERFACE IMPORTED) target_include_directories(Vec::Vec INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/vec") -if (EMSCRIPTEN) - add_library(lego1 STATIC - LEGO1/main.cpp - ) -else() - add_library(lego1 SHARED - LEGO1/main.cpp - ) -endif() - +add_library(lego1 + LEGO1/main.cpp +) target_precompile_headers(lego1 PRIVATE "LEGO1/lego1_pch.h") set_property(TARGET lego1 PROPERTY DEFINE_SYMBOL "LEGO1_DLL") target_include_directories(lego1 PUBLIC "$")