From d7d6067d5893adb404ffd8a6bc46a677ad286b81 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sat, 3 Feb 2024 18:11:04 -0500
Subject: [PATCH] set -gcodeview on Clang as well

since it works better there
---
 CMakeLists.txt                   | 22 ++++++++++++----------
 src/engine/dispatchContainer.cpp |  4 ++++
 src/gui/guiConst.cpp             |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c4d4eca4..2fcb74921 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -918,17 +918,19 @@ set(USED_SOURCES ${ENGINE_SOURCES} ${AUDIO_SOURCES} ${CLI_SOURCES} src/main.cpp)
 
 if (USE_BACKWARD)
   list(APPEND USED_SOURCES src/backtrace.cpp)
-  if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    include(CheckCXXCompilerFlag)
-    check_cxx_compiler_flag(-gcodeview GCC_CODEVIEW)
-    if (GCC_CODEVIEW)
-      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--pdb= ")
-      add_compile_options(-gcodeview)
-      message(STATUS "Enabling -gcodeview flag for backward-cpp.")
-    else()
-      message(WARNING "Could not enable -gcodeview! backward-cpp will not work.")
+  if (WIN32)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+      include(CheckCXXCompilerFlag)
+      check_cxx_compiler_flag(-gcodeview GCC_CODEVIEW)
+      if (GCC_CODEVIEW)
+        set(CMAKE_EXE_LINKER_FLAGS "-Wl,--pdb= ")
+        add_compile_options(-gcodeview)
+        message(STATUS "Enabling -gcodeview flag for backward-cpp.")
+      else()
+        message(WARNING "Could not enable -gcodeview! backward-cpp will not work.")
+      endif()
+      list(APPEND DEPENDENCIES_LIBRARIES dbghelp psapi)
     endif()
-    list(APPEND DEPENDENCIES_LIBRARIES dbghelp psapi)
   endif()
   find_library(EXECINFO_IS_LIBRARY execinfo)
   if (EXECINFO_IS_LIBRARY)
diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp
index 06049a69f..8118c4a54 100644
--- a/src/engine/dispatchContainer.cpp
+++ b/src/engine/dispatchContainer.cpp
@@ -84,6 +84,7 @@
 #include "platform/pcmdac.h"
 #include "platform/esfm.h"
 #include "platform/powernoise.h"
+#include "platform/dave.h"
 #include "platform/dummy.h"
 #include "../ta-log.h"
 #include "song.h"
@@ -652,6 +653,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
     case DIV_SYSTEM_POWERNOISE:
       dispatch=new DivPlatformPowerNoise;
       break;
+    case DIV_SYSTEM_DAVE:
+      dispatch=new DivPlatformDave;
+      break;
     case DIV_SYSTEM_DUMMY:
       dispatch=new DivPlatformDummy;
       break;
diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp
index 70f2eaa73..eaa3996b2 100644
--- a/src/gui/guiConst.cpp
+++ b/src/gui/guiConst.cpp
@@ -1211,6 +1211,7 @@ const int availableSystems[]={
   DIV_SYSTEM_ESFM,
   DIV_SYSTEM_PONG,
   DIV_SYSTEM_POWERNOISE,
+  DIV_SYSTEM_DAVE,
   0 // don't remove this last one!
 };
 
@@ -1246,7 +1247,6 @@ const int chipsFM[]={
   DIV_SYSTEM_OPL3_DRUMS,
   DIV_SYSTEM_OPZ,
   DIV_SYSTEM_ESFM,
-  DIV_SYSTEM_DAVE,
   0 // don't remove this last one!
 };