Merge branch 'master' into sqc-20_audiobullet

2023-10-16 17:43:32 -04:00
parent 9cbf20ba21 81240c6f70
commit 18a5d98c57
19 changed files with 483 additions and 134 deletions
--- a/SQCSim2021/audio.h
+++ b/SQCSim2021/audio.h
@@ -1,8 +1,14 @@
 #ifndef AUDIO_H__
 #define AUDIO_H__

+#ifdef _WIN32
 #include <irrKlang.h>
 #include <ik_ISoundSource.h>
+#else
+#include "./external/irrKlang-64bit-1.6.0/include/irrKlang.h"
+#include "./external/irrKlang-64bit-1.6.0/include/ik_ISoundSource.h"
+#endif
+
 #include "../SQCSim-common/vector3.h"
 #include "define.h"

@@ -29,4 +35,4 @@ public:
 	void PauseEngine();
 };

-#endif // AUDIO_H__
+#endif // AUDIO_H__