More checks before autolinking

src/audio/sampman_miles.cpp

@@ -18,7 +18,9 @@
 #include "Timer.h"
 #include "crossplatform.h"
 
+#if defined _MSC_VER && !defined RE3_NO_AUTOLINK
 #pragma comment( lib, "mss32.lib" )
+#endif
 
 // --MIAMI: file done
 

src/audio/sampman_oal.cpp

@@ -38,7 +38,7 @@
 //TODO: max channels
 //TODO: loop count
 
-#ifdef _WIN32
+#if defined _MSC_VER && !defined RE3_NO_AUTOLINK
 #pragma comment( lib, "OpenAL32.lib" )
 #endif
 

src/core/Pad.cpp

@@ -10,6 +10,7 @@
 #include "crossplatform.h"
 #include "platform.h"
 #ifdef XINPUT
+#if defined _MSC_VER && !defined RE3_NO_AUTOLINK
 #include <xinput.h>
 #if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1)
 #pragma comment( lib, "Xinput9_1_0.lib" )
@@ -17,6 +18,7 @@
 #pragma comment( lib, "Xinput.lib" )
 #endif
 #endif
+#endif
 
 #include "Pad.h"
 #include "ControllerConfig.h"

src/skel/glfw/glfw.cpp

@@ -223,7 +223,7 @@ psGrabScreen(RwCamera *pCamera)
 /*
  *****************************************************************************
  */
-#ifdef _WIN32
+#if defined _MSC_VER && !defined RE3_NO_AUTOLINK
 #pragma comment( lib, "Winmm.lib" ) // Needed for time
 RwUInt32
 psTimer(void)

src/skel/win/win.cpp

@@ -32,6 +32,7 @@
 
 #define WM_GRAPHNOTIFY	WM_USER+13
 
+#if defined _MSC_VER && !defined RE3_NO_AUTOLINK
 #ifndef USE_D3D9
 #pragma comment( lib, "d3d8.lib" )
 #endif
@@ -40,6 +41,7 @@
 #pragma comment( lib, "dxguid.lib" )
 #pragma comment( lib, "strmiids.lib" )
 #pragma comment( lib, "dinput8.lib" )
+#endif
 
 #if (defined(_MSC_VER))
 #include <tchar.h>