From 29719e8fc1ec884b14084b47d2a5ca16c5bee5b9 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Sun, 17 Jan 2021 22:03:42 +0000 Subject: [PATCH 1/2] Revert "Export high performance graphics hints in cxbxr-ldr.exe" --- CMakeLists.txt | 7 ++----- projects/cxbx/CMakeLists.txt | 2 -- projects/cxbxr-ldr/CMakeLists.txt | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c62934d2d..d87268439 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,6 +226,7 @@ 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 @@ -246,11 +247,6 @@ 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 @@ -258,6 +254,7 @@ 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 e961e1a99..3ea75fa90 100644 --- a/projects/cxbx/CMakeLists.txt +++ b/projects/cxbx/CMakeLists.txt @@ -87,7 +87,6 @@ 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}) @@ -99,7 +98,6 @@ 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 477944953..fef892045 100644 --- a/projects/cxbxr-ldr/CMakeLists.txt +++ b/projects/cxbxr-ldr/CMakeLists.txt @@ -31,7 +31,6 @@ 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}) From dab91c1913b65a6f73c7d44a561f0a5787167c27 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 18 Jan 2021 05:42:38 -0600 Subject: [PATCH 2/2] remove broken source file path originally in pull request --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d87268439..e5fe1e3a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,7 +254,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"