Merge branch 'developer' into feature/werkendewav

2016-06-20 20:34:35 +02:00
parent f93c09a999 779cf5cb91
commit 8cf1b02cf7
11 changed files with 36 additions and 24 deletions
@@ -1,8 +1,17 @@
 #include "Sound.h"

 #include <iostream>
+#ifdef WIN32
 #include <windows.h>
 #include <al.h>
+#else
+#include <AL/al.h>
+typedef unsigned long DWORD;
+typedef unsigned short WORD;
+typedef unsigned int UNINT32;
+typedef unsigned char BYTE;
+#endif
+

 Sound::Sound(const char* inWavPath, bool inLooping):
 	buffer_id(0),