From 0bfc4c447997bad6a0f812c7ef8c692fe27a05d8 Mon Sep 17 00:00:00 2001 From: Silent Date: Tue, 12 Jan 2021 21:39:22 +0100 Subject: [PATCH] Export high performance graphics hints in cxbxr-ldr --- CMakeLists.txt | 7 +++++-- projects/cxbx/CMakeLists.txt | 2 ++ projects/cxbxr-ldr/CMakeLists.txt | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 212be2f6b..0d0175bc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,7 +226,6 @@ file (GLOB CXBXR_SOURCE_COMMON "${CXBXR_ROOT_DIR}/src/common/xdvdfs-tools/buffered_io.cpp" "${CXBXR_ROOT_DIR}/src/common/xdvdfs-tools/xdvdfs.cpp" "${CXBXR_ROOT_DIR}/src/CxbxVersion.cpp" - "${CXBXR_ROOT_DIR}/src/HighPerformanceGraphicsEnabler.c" ) # GUI v1 @@ -247,6 +246,11 @@ file (GLOB CXBXR_SOURCE_GUIv1 "${CXBXR_ROOT_DIR}/src/gui/WndMain.cpp" ) +# Executables (cxbx and cxbxr-ldr) +file (GLOB CXBXR_SOURCE_EXECUTABLES + "${CXBXR_ROOT_DIR}/src/HighPerformanceGraphicsEnabler.c" +) + # Emulator (module) # TODO: Merge CXBXR_KRNL_CPP into CXBXR_SOURCE_EMU once cxbx project is removed. file (GLOB CXBXR_KRNL_CPP @@ -254,7 +258,6 @@ file (GLOB CXBXR_KRNL_CPP ) file (GLOB CXBXR_SOURCE_EMU "${CXBXR_KRNL_CPP}" - "${CXBXR_ROOT_DIR}/HighPerformanceGraphicsEnabler.c" "${CXBXR_ROOT_DIR}/src/common/AddressRanges.cpp" "${CXBXR_ROOT_DIR}/src/common/VerifyAddressRanges.cpp" "${CXBXR_ROOT_DIR}/src/common/util/gloffscreen/glextensions.cpp" diff --git a/projects/cxbx/CMakeLists.txt b/projects/cxbx/CMakeLists.txt index 3ea75fa90..e961e1a99 100644 --- a/projects/cxbx/CMakeLists.txt +++ b/projects/cxbx/CMakeLists.txt @@ -87,6 +87,7 @@ source_group(TREE ${CXBXR_ROOT_DIR}/src PREFIX source FILES ${CXBXR_SOURCE_GUIv1} ${CXBXR_SOURCE_COMMON} ${CXBXR_SOURCE_EMU} + ${CXBXR_SOURCE_EXECUTABLES} ) source_group(TREE ${CXBXR_ROOT_DIR} FILES ${RESOURCES}) @@ -98,6 +99,7 @@ add_executable(cxbx WIN32 ${RESOURCES} ${CXBXR_SOURCE_GUIv1} ${CXBXR_SOURCE_COMMON} ${CXBXR_SOURCE_EMU} + ${CXBXR_SOURCE_EXECUTABLES} ${CXBXR_GIT_VERSION_H} ) diff --git a/projects/cxbxr-ldr/CMakeLists.txt b/projects/cxbxr-ldr/CMakeLists.txt index fef892045..477944953 100644 --- a/projects/cxbxr-ldr/CMakeLists.txt +++ b/projects/cxbxr-ldr/CMakeLists.txt @@ -31,6 +31,7 @@ file (GLOB SOURCES "${CXBXR_ROOT_DIR}/src/common/AddressRanges.cpp" "${CXBXR_ROOT_DIR}/src/common/ReserveAddressRanges.cpp" "${CXBXR_ROOT_DIR}/src/loader/cxbxr-ldr.cpp" + ${CXBXR_SOURCE_EXECUTABLES} ) source_group(TREE ${CXBXR_ROOT_DIR}/src PREFIX header FILES ${HEADERS})