From 8aa84d089e4233e17a6263cb0cf629331e63d051 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 26 Mar 2024 17:47:11 +0100
Subject: Compile fixes for MSYS2 UCRT64

Also added instructions for installing the dependencies on MSYS2.

The selection of the default language is commented out for now. It will
be fixed in another change.
---
 src/gui/npcdialog.cpp  | 2 +-
 src/gui/truetypefont.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 8150a01a..90d3e37e 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -407,7 +407,7 @@ void NpcDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
     {
         action(gcn::ActionEvent(mNextButton, mNextButton->getActionEventId()));
     }
-    if (mouseEvent.getSource() == mTextBox && isDoubleClick((int)(long)mTextBox))
+    if (mouseEvent.getSource() == mTextBox && isDoubleClick((int)(intptr_t)mTextBox))
     {
         if (mActionState == NPC_ACTION_NEXT || mActionState == NPC_ACTION_CLOSE)
             action(gcn::ActionEvent(mNextButton,
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index b3ebcc73..9aa308b1 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -25,11 +25,7 @@
 
 #include <guichan/font.hpp>
 
-#ifdef __WIN32__
-#include <SDL/SDL_ttf.h>
-#else
 #include <SDL_ttf.h>
-#endif
 
 #include <list>
 #include <string>
-- 
cgit v1.2.3-70-g09d2