allow kenbuild to compile with Xaudio2 using MinGW-W64

Using mingw-w64 13.0.0 on macOS cross-compiling to x86-64, the resulting
executables can be successfully run under Wine. DLL dependencies are:
libgcc_s_seh-1.dll libstdc++-6.dll libwinpthread-1.dll

fixes #24

Author: jonof

README.md

@@ -69,6 +69,13 @@ _SDL2.framework_ found in the _.dmg_ file to _xcode/frameworks_.
    game with: `nmake /f Makefile.msvc`
 4. Assuming that was successful, run the test game with: `data\game`
 
+### With MinGW-W64 cross-compiling for Windows
+
+1. (For example, on macOS with Homebrew) Install _mingw-w64_ with: `brew install mingw-w64`
+2. Change into the _kenbuild_ subdirectory of this cloned repository, then compile
+   the test game with: `make HOST{CC=cc,CXX=c++} $(set CC=gcc CXX=g++ RC=windres
+   RANLIB=ranlib AR=ar; echo ${@/=/=x86_64-w64-mingw32-})`
+
 Compilation options
 -------------------
 

kenbuild/Makefile

@@ -87,8 +87,9 @@ ifeq ($(RENDERTYPE),SDL)
 	endif
 endif
 ifeq ($(RENDERTYPE),WIN)
-	GAMEEXEOBJS+= $(SRC)/kdmsound_stub.$o $(SRC)/gameres.$(res) $(SRC)/startwin_game.$o
+	GAMEEXEOBJS+= $(SRC)/kdmsound_xaudio2.$o $(SRC)/gameres.$(res) $(SRC)/startwin_game.$o
 	EDITOREXEOBJS+= $(SRC)/buildres.$(res)
+	GAMELDFLAGS+= -lxaudio2_9 -lole32
 endif
 
 .PHONY: clean veryclean all

kenbuild/src/kdmsound.c

@@ -176,7 +176,7 @@ void setears(int daposx, int daposy, int daxvect, int dayvect)
     unlockkdm();
 }
 
-void wsayfollow(char *dafilename, int dafreq, int davol, int *daxplc, int *dayplc, char followstat)
+void wsayfollow(const char *dafilename, int dafreq, int davol, int *daxplc, int *dayplc, char followstat)
 {
     char ch1, ch2, bad;
     int i, wavnum, chanum;
@@ -234,7 +234,7 @@ void wsayfollow(char *dafilename, int dafreq, int davol, int *daxplc, int *daypl
     }
 }
 
-void wsay(char *dafilename, int dafreq, int volume1, int volume2)
+void wsay(const char *dafilename, int dafreq, int volume1, int volume2)
 {
     char ch1, ch2;
     int i, j, bad;
@@ -266,7 +266,7 @@ void wsay(char *dafilename, int dafreq, int volume1, int volume2)
     } while (i >= 0);
 }
 
-void loadwaves(char *wavename)
+void loadwaves(const char *wavename)
 {
     int fil, i, j, dawaversionum, totsndbytes;
 
@@ -321,7 +321,7 @@ void loadwaves(char *wavename)
     snd[totsndbytes] = snd[totsndbytes+1] = 128;
 }
 
-int loadsong(char *filename)
+int loadsong(const char *filename)
 {
     int i, fil;
     int kdmversionum;

kenbuild/src/kdmsound.h

@@ -23,10 +23,10 @@ void uninitsb(void);
 void refreshaudio(void);
 
 void setears(int daposx, int daposy, int daxvect, int dayvect);
-void wsayfollow(char *dafilename, int dafreq, int davol, int *daxplc, int *dayplc, char followstat);
-void wsay(char *dafilename, int dafreq, int volume1, int volume2);
-void loadwaves(char *wavename);
-int loadsong(char *songname);
+void wsayfollow(const char *dafilename, int dafreq, int davol, int *daxplc, int *dayplc, char followstat);
+void wsay(const char *dafilename, int dafreq, int volume1, int volume2);
+void loadwaves(const char *wavename);
+int loadsong(const char *songname);
 void musicon(void);
 void musicoff(void);
 

kenbuild/src/kdmsound_xaudio2.cpp

@@ -11,6 +11,12 @@
 #include "windows.h"
 #include "xaudio2.h"
 
+#if defined(__MINGW32__) && !defined(XAUDIO2_USE_DEFAULT_PROCESSOR)
+#define XAUDIO2_USE_DEFAULT_PROCESSOR XAUDIO2_ANY_PROCESSOR
+#endif
+#define kmin(a,b) ((a)<(b)?(a):(b))
+#define kmax(a,b) ((a)>(b)?(a):(b))
+
 extern "C" {
 #define KDMSOUND_INTERNAL
 #include "kdmsound.h"
@@ -73,7 +79,7 @@ void initsb(char dadigistat, char damusistat, int dasamplerate, char danumspeake
 
     WAVEFORMATEX sourcefmt = {0};
     sourcefmt.wFormatTag = WAVE_FORMAT_PCM;
-    sourcefmt.nChannels = max(1, min(2, danumspeakers));
+    sourcefmt.nChannels = kmax(1, kmin(2, danumspeakers));
     sourcefmt.nSamplesPerSec = dasamplerate;
     sourcefmt.wBitsPerSample = dabytespersample * 8;
     sourcefmt.nBlockAlign = sourcefmt.nChannels * dabytespersample;