diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d34f5ae..a06dc137f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -404,6 +404,6 @@ if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^9]|[9][0-9])") endif() # Cxbx-Reloaded project with third-party libraries -set_target_properties(cxbx cxbxr-ldr cxbxr-emu misc-batch subhook XbSymbolDatabase libtommath libtomcrypt +set_target_properties(cxbx cxbxr-ldr cxbxr-emu misc-batch subhook libXbSymbolDatabase libtommath libtomcrypt PROPERTIES FOLDER Cxbx-Reloaded ) diff --git a/import/XbSymbolDatabase b/import/XbSymbolDatabase index 0f2794cac..78d06c0d9 160000 --- a/import/XbSymbolDatabase +++ b/import/XbSymbolDatabase @@ -1 +1 @@ -Subproject commit 0f2794cac610fad4f1955241ef43e6254fd11205 +Subproject commit 78d06c0d9d8fe3b5d43e90312fc5910928c9c651 diff --git a/projects/cxbx/CMakeLists.txt b/projects/cxbx/CMakeLists.txt index 18cd919b1..201b23668 100644 --- a/projects/cxbx/CMakeLists.txt +++ b/projects/cxbx/CMakeLists.txt @@ -180,7 +180,7 @@ set(WINS_LIB ) target_link_libraries(cxbx - PUBLIC XbSymbolDatabase + PUBLIC libXbSymbolDatabase subhook libtomcrypt SDL2 diff --git a/projects/cxbxr-emu/CMakeLists.txt b/projects/cxbxr-emu/CMakeLists.txt index fc192973a..890d2adf2 100644 --- a/projects/cxbxr-emu/CMakeLists.txt +++ b/projects/cxbxr-emu/CMakeLists.txt @@ -156,7 +156,7 @@ set(WINS_LIB ) target_link_libraries(cxbxr-emu - PUBLIC XbSymbolDatabase + PUBLIC libXbSymbolDatabase subhook libtomcrypt SDL2 diff --git a/src/core/hle/Intercept.cpp b/src/core/hle/Intercept.cpp index f97b5cbf8..846994a03 100644 --- a/src/core/hle/Intercept.cpp +++ b/src/core/hle/Intercept.cpp @@ -40,8 +40,7 @@ #include "EmuShared.h" #include "common\CxbxDebugger.h" #include "Logging.h" -#pragma comment(lib, "XbSymbolDatabase.lib") -#include "..\..\import\XbSymbolDatabase\XbSymbolDatabase.h" +#include #include "Intercept.hpp" #include "Patches.hpp" #include "common\util\hasher.h"