From 7541fa7cb73870a2a5af3300c35ec9ad081ec369 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Thu, 14 Jan 2021 22:26:36 +0100 Subject: [PATCH] Revert extra checks before autolinking --- src/audio/sampman_miles.cpp | 2 -- src/skel/glfw/glfw.cpp | 2 +- src/skel/win/win.cpp | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 43c46fc4..2a4286eb 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -18,9 +18,7 @@ #include "Timer.h" #include "crossplatform.h" -#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #pragma comment( lib, "mss32.lib" ) -#endif // --MIAMI: file done diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 3c1dac5d..f039819c 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -223,7 +223,7 @@ psGrabScreen(RwCamera *pCamera) /* ***************************************************************************** */ -#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK +#ifdef _WIN32 #pragma comment( lib, "Winmm.lib" ) // Needed for time RwUInt32 psTimer(void) diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 8738a714..1fd959f2 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -32,7 +32,6 @@ #define WM_GRAPHNOTIFY WM_USER+13 -#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #ifndef USE_D3D9 #pragma comment( lib, "d3d8.lib" ) #endif @@ -41,7 +40,6 @@ #pragma comment( lib, "dxguid.lib" ) #pragma comment( lib, "strmiids.lib" ) #pragma comment( lib, "dinput8.lib" ) -#endif #if (defined(_MSC_VER)) #include