steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-06 10:00:16 +02:00
Code Issues Packages Projects Releases 66 Wiki Activity

External: merge json targets

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
This commit is contained in:
Alyssa Rosenzweig committed 2024-08-15 21:24:44 -04:00
1 parent 1b8b1a24b0
commit 7a2d8c5c01
3 files changed
+3 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

External/tiny-json/CMakeLists.txt
Vendored
+1 -5
View File
@@ -1,7 +1,3 @@
set(NAME tiny-json)
set(SRCS tiny-json.c)
add_library(${NAME} ${SRCS})
set(NAME json-maker)
set(SRCS json-maker.c)
set(SRCS tiny-json.c json-maker.c)
add_library(${NAME} ${SRCS})
Source/Common/CMakeLists.txt
+1 -1
View File
@@ -16,7 +16,7 @@ if (NOT MINGW_BUILD)
endif()
add_library(${NAME} STATIC ${SRCS})
target_link_libraries(${NAME} FEXCore_Base cpp-optparse tiny-json json-maker FEXHeaderUtils)
target_link_libraries(${NAME} FEXCore_Base cpp-optparse tiny-json FEXHeaderUtils)
target_include_directories(${NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/External/cpp-optparse/)
target_include_directories(${NAME} PRIVATE ${CMAKE_BINARY_DIR}/generated)
target_include_directories(${NAME} PRIVATE ${CMAKE_SOURCE_DIR}/External/xbyak/)
Source/Tools/FEXConfig/CMakeLists.txt
+1 -1
View File
@@ -22,7 +22,7 @@ else()
target_link_libraries(${NAME} PRIVATE ${SDL2_LIBRARIES})
endif()
target_link_libraries(${NAME} PRIVATE Common pthread epoxy X11 EGL imgui json-maker)
target_link_libraries(${NAME} PRIVATE Common pthread epoxy X11 EGL imgui)
if (CMAKE_BUILD_TYPE MATCHES "RELEASE")
target_link_options(${NAME}