ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1965 from RadWolfie/update-submodule 

Update XbSymbolDatabase Submodule
This commit is contained in:
Luke Usher 2020-09-25 07:15:55 +01:00 committed by GitHub
parent abb50d6f99 eaeb521bd9
commit abe0c827d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -404,6 +404,6 @@ if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^9]|[9][0-9])")
endif() endif()
# Cxbx-Reloaded project with third-party libraries # 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 PROPERTIES FOLDER Cxbx-Reloaded
) )

2
import/XbSymbolDatabase

@ -1 +1 @@
Subproject commit 0f2794cac610fad4f1955241ef43e6254fd11205 Subproject commit 78d06c0d9d8fe3b5d43e90312fc5910928c9c651

2
projects/cxbx/CMakeLists.txt
View File

@ -180,7 +180,7 @@ set(WINS_LIB
) )
target_link_libraries(cxbx target_link_libraries(cxbx
PUBLIC XbSymbolDatabase PUBLIC libXbSymbolDatabase
subhook subhook
libtomcrypt libtomcrypt
SDL2 SDL2

2
projects/cxbxr-emu/CMakeLists.txt
View File

@ -156,7 +156,7 @@ set(WINS_LIB
) )
target_link_libraries(cxbxr-emu target_link_libraries(cxbxr-emu
PUBLIC XbSymbolDatabase PUBLIC libXbSymbolDatabase
subhook subhook
libtomcrypt libtomcrypt
SDL2 SDL2

3
src/core/hle/Intercept.cpp
View File

@ -40,8 +40,7 @@
#include "EmuShared.h" #include "EmuShared.h"
#include "common\CxbxDebugger.h" #include "common\CxbxDebugger.h"
#include "Logging.h" #include "Logging.h"
#pragma comment(lib, "XbSymbolDatabase.lib") #include <libXbSymbolDatabase.h>
#include "..\..\import\XbSymbolDatabase\XbSymbolDatabase.h"
#include "Intercept.hpp" #include "Intercept.hpp"
#include "Patches.hpp" #include "Patches.hpp"
#include "common\util\hasher.h" #include "common\util\hasher.h"