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

Removed all the old Magenta-specific stuff

Browse Source
This commit is contained in:
Max Wash
2020-10-04 12:09:40 +01:00
parent cbef0680a0
commit 635059acc3
11 changed files with 33 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@@ -76,22 +76,22 @@ file(GLOB platform_headers
set(photon_libc_sources ${photon_libc_sources} ${malloc_sources} ${platform_sources})
set(photon_libc_headers ${photon_libc_headers} ${platform_headers})
add_framework(Photon STATIC
add_framework(photon STATIC
BUNDLE_ID net.doorstuck.photon
SOURCES ${photon_libc_sources} ${photon_libc_headers}
HEADERS ${CMAKE_CURRENT_BINARY_DIR}/sysroot/usr/include/*)
bundle_compile_options(Photon PRIVATE -ffreestanding -nostdlib -fPIC -fPIE)
bundle_link_libraries(Photon ${photon_platform_libs})
bundle_link_frameworks(Photon ${photon_platform_frameworks})
bundle_compile_options(photon PRIVATE -ffreestanding -nostdlib -fPIC -fPIE)
bundle_link_libraries(photon ${photon_platform_libs})
bundle_link_frameworks(photon ${photon_platform_frameworks})
bundle_include_directories(Photon PRIVATE
bundle_include_directories(photon PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/include
${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/sys/${platform}/
${CMAKE_CURRENT_BINARY_DIR}/sysroot/usr/include)
foreach (platform_include_dir ${photon_platform_extra_include_dirs})
bundle_include_directories(Photon
bundle_include_directories(photon
${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/sys/${platform}/${platform_include_dir})
endforeach (platform_include_dir)
@@ -102,20 +102,20 @@ add_custom_target(local-root
${CMAKE_CURRENT_BINARY_DIR}
${platform} ${machine})
bundle_add_dependencies(Photon local-root crt)
bundle_add_dependencies(photon local-root crt)
add_custom_command(TARGET Photon POST_BUILD
add_custom_command(TARGET photon POST_BUILD
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/add-framework-crt.sh
${CMAKE_CURRENT_BINARY_DIR}/Photon.framework
${CMAKE_CURRENT_BINARY_DIR}/photon.framework
${CMAKE_CURRENT_BINARY_DIR})
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
bundle_link_libraries(Photon gcc)
bundle_link_libraries(photon gcc)
endif ()
if (TARGET early-sysroot)
# We are being built as part of asbestOS, make sure the sysroot is there.
bundle_add_dependencies(Photon early-sysroot)
bundle_add_dependencies(photon early-sysroot)
endif ()
if (PHOTON_TESTS EQUAL 1)