From 6f79b035bdf84c56b0822a84a91d636ca00f4a29 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Fri, 24 Jun 2022 18:11:06 -0500 Subject: [PATCH] cmake: include nv2a_vsh_cpu libraries --- CMakeLists.txt | 7 +++++++ projects/cxbxr-emu/CMakeLists.txt | 1 + 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 141d77afb..4d10741a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,9 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/projects/imgui") add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/projects/libusb") +set(nv2a_vsh_cpu_UNIT_TEST OFF) +add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/import/nv2a_vsh_cpu" EXCLUDE_FROM_ALL) + # Split the files into group for which project is likely # going to be used for both header and source files. # Then move only specific project files into their @@ -437,6 +440,10 @@ set_target_properties(cxbx cxbxr-ldr cxbxr-emu misc-batch SDL2 subhook libXbSymb PROPERTIES FOLDER Cxbx-Reloaded ) +set_target_properties(nv2a_vsh_emulator nv2a_vsh_disassembler nv2a_vsh_cpu + PROPERTIES FOLDER Cxbx-Reloaded/nv2a_vsh +) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # Configure startup project set_property(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" PROPERTY VS_STARTUP_PROJECT cxbx) diff --git a/projects/cxbxr-emu/CMakeLists.txt b/projects/cxbxr-emu/CMakeLists.txt index de66678c6..adb1888bc 100644 --- a/projects/cxbxr-emu/CMakeLists.txt +++ b/projects/cxbxr-emu/CMakeLists.txt @@ -171,6 +171,7 @@ target_link_libraries(cxbxr-emu SDL2 imgui libusb + nv2a_vsh_emulator ${WINS_LIB} )