wash/photon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

photon.framework now supports static and dynamic builds

Browse Source
This commit is contained in:
Max Wash
2020-11-24 14:46:24 +00:00
parent 8991e21636
commit 439a18535f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -79,7 +79,7 @@ file(GLOB platform_headers
set(photon_libc_sources ${photon_libc_sources} ${malloc_sources} ${platform_sources}) set(photon_libc_sources ${photon_libc_sources} ${malloc_sources} ${platform_sources})
set(photon_libc_headers ${photon_libc_headers} ${platform_headers}) set(photon_libc_headers ${photon_libc_headers} ${platform_headers})
add_framework(photon SHARED add_framework(photon STATIC SHARED
BUNDLE_ID net.doorstuck.photon BUNDLE_ID net.doorstuck.photon
SOURCES ${photon_libc_sources} ${photon_libc_headers} SOURCES ${photon_libc_sources} ${photon_libc_headers}
HEADERS ${CMAKE_CURRENT_BINARY_DIR}/sysroot/usr/include/*) HEADERS ${CMAKE_CURRENT_BINARY_DIR}/sysroot/usr/include/*)

9
scripts/add-framework-crt.sh
View File

@@ -6,4 +6,11 @@ binary_dir=$3
crt_files=$(find $binary_dir -name "crt*.o") crt_files=$(find $binary_dir -name "crt*.o")
$bundle_prog framework add-binaries -f $framework_path $crt_files $bundle_prog framework add-binaries \
-f $framework_path \
-m static \
$crt_files
$bundle_prog framework add-binaries \
-f $framework_path \
$crt_files