diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2021-01-14 22:15:36 +0100 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2021-01-14 22:15:36 +0100 |
| commit | 1082b138301767a73877af30509712f7c6f5f6ee (patch) | |
| tree | 6b2d3b8832dcdb03636cd76e823ef18eadc3f6be | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-1082b138301767a73877af30509712f7c6f5f6ee.tar re3-1082b138301767a73877af30509712f7c6f5f6ee.tar.gz re3-1082b138301767a73877af30509712f7c6f5f6ee.tar.bz2 re3-1082b138301767a73877af30509712f7c6f5f6ee.tar.lz re3-1082b138301767a73877af30509712f7c6f5f6ee.tar.xz re3-1082b138301767a73877af30509712f7c6f5f6ee.tar.zst re3-1082b138301767a73877af30509712f7c6f5f6ee.zip | |
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/audio/oal/stream.cpp | 2 | ||||
| -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 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc204d17..ad72eb56 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,7 +36,7 @@ target_compile_definitions(${EXECUTABLE} PRIVATE $<IF:$<CONFIG:DEBUG>,DEBUG,NDEBUG> LIBRW - ${PROJECT}_NO_AUTOLINK + CMAKE_NO_AUTOLINK ) if(LIBRW_PLATFORM_D3D9) diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp index 4523b07a..19fa4ec4 100644 --- a/src/audio/oal/stream.cpp +++ b/src/audio/oal/stream.cpp @@ -4,7 +4,7 @@ #include "stream.h" #include "sampman.h" -#if defined _MSC_VER && !defined RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #ifdef AUDIO_OAL_USE_SNDFILE #pragma comment( lib, "libsndfile-1.lib" ) #endif diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 2a9b4a13..43c46fc4 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -18,7 +18,7 @@ #include "Timer.h" #include "crossplatform.h" -#if defined _MSC_VER && !defined RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #pragma comment( lib, "mss32.lib" ) #endif diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 27b60e8f..e944b05f 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -38,7 +38,7 @@ //TODO: max channels //TODO: loop count -#if defined _MSC_VER && !defined RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #pragma comment( lib, "OpenAL32.lib" ) #endif diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 8d55250a..757f0f50 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -10,7 +10,7 @@ #include "crossplatform.h" #include "platform.h" #ifdef XINPUT -#if defined _MSC_VER && !defined RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #include <xinput.h> #if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1) #pragma comment( lib, "Xinput9_1_0.lib" ) diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index e34edf7a..3c1dac5d 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 RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_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 85278432..8738a714 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -32,7 +32,7 @@ #define WM_GRAPHNOTIFY WM_USER+13 -#if defined _MSC_VER && !defined RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #ifndef USE_D3D9 #pragma comment( lib, "d3d8.lib" ) #endif |