From 3c74d95e17ceb16b05012bece3355b56d21c3463 Mon Sep 17 00:00:00 2001 From: scribam Date: Tue, 20 Apr 2021 18:23:04 +0200 Subject: [PATCH 1/2] .gitignore: Add CLion specific files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index d81b16c69..1fde17287 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,10 @@ [Bb]uild/ [Bb]uild-*/ +# CLion +.idea/ +cmake-build-*/ + # Visual Studio Cache .vs/ From 36b83a8e527fa43a1a414260b618cea29b493ac4 Mon Sep 17 00:00:00 2001 From: scribam Date: Tue, 20 Apr 2021 18:25:10 +0200 Subject: [PATCH 2/2] cmake: /DELAYLOAD requires delayimp lib --- projects/cxbx/CMakeLists.txt | 1 + projects/cxbxr-emu/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/cxbx/CMakeLists.txt b/projects/cxbx/CMakeLists.txt index caa11597d..9848d11f1 100644 --- a/projects/cxbx/CMakeLists.txt +++ b/projects/cxbx/CMakeLists.txt @@ -168,6 +168,7 @@ set(WINS_LIB legacy_stdio_definitions d3d9 d3dcompiler + delayimp dinput8 dxguid odbc32 diff --git a/projects/cxbxr-emu/CMakeLists.txt b/projects/cxbxr-emu/CMakeLists.txt index 7aa1f6e98..02e264497 100644 --- a/projects/cxbxr-emu/CMakeLists.txt +++ b/projects/cxbxr-emu/CMakeLists.txt @@ -144,6 +144,7 @@ set(WINS_LIB legacy_stdio_definitions d3d9 d3dcompiler + delayimp dinput8 dxguid odbc32