From 7a2d8c5c01f21405f319d82a12a04ebccb5ceb81 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 15 Aug 2024 21:24:35 -0400 Subject: [PATCH] External: merge json targets Signed-off-by: Alyssa Rosenzweig --- External/tiny-json/CMakeLists.txt | 6 +----- Source/Common/CMakeLists.txt | 2 +- Source/Tools/FEXConfig/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/External/tiny-json/CMakeLists.txt b/External/tiny-json/CMakeLists.txt index 59e294745..d43172881 100644 --- a/External/tiny-json/CMakeLists.txt +++ b/External/tiny-json/CMakeLists.txt @@ -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}) diff --git a/Source/Common/CMakeLists.txt b/Source/Common/CMakeLists.txt index 1563eb656..241df8e5a 100644 --- a/Source/Common/CMakeLists.txt +++ b/Source/Common/CMakeLists.txt @@ -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/) diff --git a/Source/Tools/FEXConfig/CMakeLists.txt b/Source/Tools/FEXConfig/CMakeLists.txt index 74345dd7b..3afb233ed 100644 --- a/Source/Tools/FEXConfig/CMakeLists.txt +++ b/Source/Tools/FEXConfig/CMakeLists.txt @@ -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}