Merge branch 'miami' into lcs

# Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # premake5.lua # src/control/Script2.cpp # src/control/Script8.cpp
2021-01-15 17:57:35 +02:00
parent c00ebef329 19749effce
commit 4bd7bafd7c
19 changed files with 392 additions and 76 deletions
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -38,7 +38,7 @@
 //TODO: max channels
 //TODO: loop count

-#ifdef _WIN32
+#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
 #pragma comment( lib, "OpenAL32.lib" )
 #endif