RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 08:17:35 +00:00
Code Issues Activity Actions

Ports: Update c-ray patches

Browse source
This commit is contained in:
Linus Groh 2021-03-13 22:11:07 +01:00 • committed by Andreas Kling
parent caa8f3d3bf
commit 161b36bb09
6 changed files with 58 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Ports/c-ray/patches/fix-linkage.patch
View file

@ -1,30 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ccce96..1db6074 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ if (NOT NO_SDL2)
if (MSVC)
target_link_libraries(${PROJECT_NAME} ${SDL2_LIBRARY})
else()
- target_link_libraries(${PROJECT_NAME} -lpthread -lm ${SDL2_LIBRARY})
+ target_link_libraries(${PROJECT_NAME} -lSDL2 -lgui -lgfx -lipc -lcore -lpthread -lm -lstdc++)
endif()
add_definitions(-DUI_ENABLED)
else()
@@ -66,7 +66,7 @@ if (NOT NO_SDL2)
if (MSVC)
target_link_libraries(${PROJECT_NAME})
else()
- target_link_libraries(${PROJECT_NAME} -lpthread -lm)
+ target_link_libraries(${PROJECT_NAME} -lgui -lipc -lcore -lpthread -lm -lstdc++)
endif()
endif()
--- c-ray-master/CMakeLists.txt 2021-03-13 00:40:48.474000000 +0100
+++ c-ray-master/CMakeLists.txt 2021-03-13 00:41:04.770789629 +0100
@@ -38,7 +38,7 @@
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
else()
@@ -75,6 +75,6 @@ else()
if (MSVC)
target_link_libraries(${PROJECT_NAME})
else()
- target_link_libraries(${PROJECT_NAME} -lpthread -lm)
+ target_link_libraries(${PROJECT_NAME} -lgui -lipc -lcore -lpthread -lm -lstdc++)
endif()
endif()
# set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic -Wconversion -std=gnu99")
- set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-missing-field-initializers -std=gnu99 -march=native -mtune=native -D_GNU_SOURCE")
+ set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-missing-field-initializers -std=gnu99 -mtune=native -D_GNU_SOURCE")
set(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g")
if (ASAN)
@@ -71,7 +71,7 @@
target_include_directories(c-ray PRIVATE ${c-ray_SOURCE_DIR}/src)
target_include_directories(c-ray PRIVATE ${c-ray_SOURCE_DIR}/tests)
if (NOT MSVC)
- target_link_libraries(c-ray PRIVATE -lpthread -lm)
+ target_link_libraries(c-ray PRIVATE -lSDL2 -lgui -lgfx -lipc -lcore -lpthread -lstdc++ -lm)
endif ()
include(CheckIPOSupported)