From 4f1fc7abf0b9e6c19ceb572c4badf17ec8d94cf2 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 20 Oct 2019 22:31:45 +1000 Subject: [PATCH] Fix CMake build --- src/common/CMakeLists.txt | 2 ++ src/common/{cd_image_cuesheet.cpp => cd_image_cue.cpp} | 0 src/common/common.vcxproj | 4 ++-- src/common/common.vcxproj.filters | 4 ++-- src/core/CMakeLists.txt | 1 + src/duckstation/CMakeLists.txt | 3 ++- 6 files changed, 9 insertions(+), 5 deletions(-) rename src/common/{cd_image_cuesheet.cpp => cd_image_cue.cpp} (100%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index a5974d6b5..3807bb180 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -4,6 +4,8 @@ set(SRCS bitfield.h cd_image.cpp cd_image.h + cd_image_bin.cpp + cd_image_cue.cpp cd_xa.cpp cd_xa.h gl_program.cpp diff --git a/src/common/cd_image_cuesheet.cpp b/src/common/cd_image_cue.cpp similarity index 100% rename from src/common/cd_image_cuesheet.cpp rename to src/common/cd_image_cue.cpp diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 784798184..d7c8bd055 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -50,7 +50,7 @@ - + @@ -389,4 +389,4 @@ - \ No newline at end of file + diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index 08cc215ac..393fb1f7f 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -20,10 +20,10 @@ - + - \ No newline at end of file + diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 9dddbc777..fe3942eac 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -16,6 +16,7 @@ add_library(core dma.h gpu.cpp gpu.h + gpu_commands.cpp gpu_hw.cpp gpu_hw.h gpu_hw_opengl.cpp diff --git a/src/duckstation/CMakeLists.txt b/src/duckstation/CMakeLists.txt index a221ad0eb..6efb34bb2 100644 --- a/src/duckstation/CMakeLists.txt +++ b/src/duckstation/CMakeLists.txt @@ -1,4 +1,5 @@ set(SRCS + icon.cpp main.cpp sdl_audio_stream.cpp sdl_audio_stream.h @@ -8,4 +9,4 @@ set(SRCS add_executable(duckstation ${SRCS}) target_include_directories(duckstation PRIVATE "${SDL2_INCLUDE_DIRS}") -target_link_libraries(duckstation core imgui "${SDL2_LIBRARIES}") +target_link_libraries(duckstation core imgui nativefiledialog "${SDL2_LIBRARIES}")