diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2021-01-14 22:06:27 +0100 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2021-01-14 22:06:27 +0100 |
| commit | c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1 (patch) | |
| tree | 40f48630eae122d458502b43a7c8d24502940697 | |
| parent | Backport fix from re3 (diff) | |
| download | re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.gz re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.bz2 re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.lz re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.xz re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.tar.zst re3-c7b905c0ec9ce2ff39bf74b5bfc832645a1c6ef1.zip | |
| -rw-r--r-- | src/audio/sampman_miles.cpp | 2 | ||||
| -rw-r--r-- | src/audio/sampman_oal.cpp | 2 | ||||
| -rw-r--r-- | src/core/Pad.cpp | 2 | ||||
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 2 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 2 |
5 files changed, 8 insertions, 2 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 2a4286eb..2a9b4a13 100644 --- a/src/audio/sampman_miles.cpp +++ b/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 diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index ce6458e6..27b60e8f 100644 --- 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 RE3_NO_AUTOLINK #pragma comment( lib, "OpenAL32.lib" ) #endif diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index feda19c6..8d55250a 100644 --- a/src/core/Pad.cpp +++ b/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" diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index f039819c..e34edf7a 100644 --- a/src/skel/glfw/glfw.cpp +++ b/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) diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 1fd959f2..85278432 100644 --- a/src/skel/win/win.cpp +++ b/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> |