clean up for MSVC builds

.gitignore

@@ -10,3 +10,6 @@ seq2wav_d
 *.a
 *.so
 *.exe
+*.lib
+*.exp
+*.obj

plugins/audacious/Makefile

@@ -1,13 +1,11 @@
 DLL = .so
-EXPORT = __attribute__((visibility(\"default\")))
 ifeq ($(OS),Windows_NT)
 	DLL = .dll
-	EXPORT = __declspec(dllexport)
 endif
 
 PLUGIN = TODO
 
-CXXFLAGS = -std=gnu++14 -fPIC -Wno-multichar -I../../src -I../../seq2wav/include -march=native $(shell pkg-config --cflags audacious) -DPLUGIN_NAME=\"$(PLUGIN)\" "-DEXPORT=$(EXPORT)"
+CXXFLAGS = -std=gnu++14 -fPIC -Wno-multichar -I../../src -I../../seq2wav/include -march=native $(shell pkg-config --cflags audacious) -DPLUGIN_NAME=\"$(PLUGIN)\"
 CXXFLAGS_R = $(CXXFLAGS) -O3
 CXXFLAGS_D = $(CXXFLAGS) -ggdb -fsanitize=address
 LDFLAGS = -L../../seq2wav $(shell pkg-config --libs audacious)

src/s2wconfig.h

@@ -0,0 +1,19 @@
+#ifndef S2W_S2WCONFIG_H
+#define S2W_S2WCONFIG_H
+
+#define _USE_MATH_DEFINES
+
+#include <cstdlib>
+#ifdef _MSC_VER
+typedef unsigned int ssize_t;
+#endif
+
+#ifdef _WIN32
+#define PATH_CHARS "\\/"
+#define EXPORT __declspec(dllexport)
+#else
+#define PATH_CHARS "/"
+#define EXPORT __attribute__((visibility("default")))
+#endif
+
+#endif

src/synth/audionode.h

@@ -1,7 +1,7 @@
 #ifndef S2W_AUDIONODE_H
 #define S2W_AUDIONODE_H
 
-#include <cstdint>
+#include "s2wconfig.h"
 #include <unordered_map>
 #include "audioparam.h"
 class SynthContext;

src/synth/channel.h

@@ -1,10 +1,10 @@
 #ifndef S2W_CHANNEL_H
 #define S2W_CHANNEL_H
 
+#include "s2wconfig.h"
 #include <unordered_map>
 #include <vector>
 #include <memory>
-#include <cstdint>
 #include "audionode.h"
 #include "envelope.h"
 class SynthContext;

src/synth/iinterpolator.h

@@ -1,6 +1,7 @@
 #ifndef S2W_IINTERPOLATOR_H
 #define S2W_IINTERPOLATOR_H
 
+#include "s2wconfig.h"
 #include <vector>
 #include <cstdint>
 class SampleData;

src/synth/synthcontext.h

@@ -9,7 +9,8 @@ class IInterpolator;
 class ITrack;
 class RiffWriter;
 
-struct SynthContext {
+class SynthContext {
+public:
   SynthContext(double sampleRate, int outputChannels = 2);
   ~SynthContext();
 

src/tagsm3u.cpp

@@ -12,13 +12,7 @@ static TagsM3U::TagMap m3uKeys = {
 
 std::string TagsM3U::relativeTo(const std::string& trackPath)
 {
-  int slashPos = trackPath.find_last_of(
-#ifdef _WIN32
-    "\\/"
-#else
-    "/"
-#endif
-  );
+  int slashPos = trackPath.find_last_of(PATH_CHARS);
   if (slashPos == std::string::npos) {
     return "!tags.m3u";
   }
@@ -239,13 +233,7 @@ void TagsM3U::addTrack(const std::string& trackName)
 
 int TagsM3U::findTrack(const std::string& trackName) const
 {
-  int slashPos = trackName.find_last_of(
-#ifdef _WIN32
-    "\\/"
-#else
-    "/"
-#endif
-  );
+  int slashPos = trackName.find_last_of(PATH_CHARS);
   std::string filename = trackName.substr(slashPos + 1);
   for (int i = 0; i < tracks.size(); i++) {
     if (tracks.at(i) == filename) {

src/tagsm3u.h

@@ -1,6 +1,7 @@
 #ifndef S2W_TAGSM3U_H
 #define S2W_TAGSM3U_H
 
+#include "s2wconfig.h"
 #include <iostream>
 #include <vector>
 #include <unordered_map>

src/utility.cpp

@@ -1,5 +1,6 @@
 #include "utility.h"
 #include <cmath>
+#include <cctype>
 #include <codecvt>
 #include <locale>
 #include <sstream>