mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 21:57:44 +00:00
Code Activity

Merge pull request #964 from arieshi255/fix-clang

Browse source 
Fix building on Clang and add Oodle support for Linux targets
This commit is contained in:
hkAlice 2024-07-28 05:15:17 -03:00 • committed by GitHub
commit 32bea19f2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
deps/Oodle/CMakeLists.txt vendored
View file

@ -1,5 +1,6 @@
add_library(OodleNet STATIC IMPORTED GLOBAL) add_library(OodleNet STATIC IMPORTED GLOBAL)
if(WIN32)
set_target_properties( set_target_properties(
OodleNet OodleNet
PROPERTIES PROPERTIES
@ -7,3 +8,12 @@ set_target_properties(
IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/Oodle/oo2net_9_win64.lib" IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/Oodle/oo2net_9_win64.lib"
LINKER_LANGUAGE C LINKER_LANGUAGE C
) )
elseif(UNIX)
set_target_properties(
OodleNet
PROPERTIES
IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/deps/Oodle/liboo2netlinux64.a"
IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/Oodle/liboo2netlinux64.a"
LINKER_LANGUAGE C
)
endif()

2
deps/Oodle/oodle2net.h vendored
View file

@ -1,6 +1,8 @@
#ifndef __OODLE2NET_H__ #ifndef __OODLE2NET_H__
#define __OODLE2NET_H__ #define __OODLE2NET_H__
#include <stdint.h>
extern "C" intptr_t __stdcall OodleNetwork1_Shared_Size( int32_t htbits ); extern "C" intptr_t __stdcall OodleNetwork1_Shared_Size( int32_t htbits );
extern "C" intptr_t __stdcall OodleNetwork1UDP_State_Size(); extern "C" intptr_t __stdcall OodleNetwork1UDP_State_Size();

2
deps/datReader/Exd.cpp vendored
View file

@ -249,7 +249,7 @@ namespace xiv::exd
for( int32_t i = 0; i < cacheEntry.second.subRows; i++ ) for( int32_t i = 0; i < cacheEntry.second.subRows; i++ )
{ {
// Get the vector fields for the given record and preallocate it // Get the vector fields for the given record and preallocate it
ExdRow row = { cacheEntry.first, i }; ExdRow row = { cacheEntry.first, static_cast< uint8_t >( i ) };
auto& fields = data[ row ]; auto& fields = data[ row ];
fields.reserve( memberCount ); fields.reserve( memberCount );

1
deps/datReader/bparse.h vendored
View file

@ -5,6 +5,7 @@
#include <iomanip> #include <iomanip>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <cstdint>
namespace xiv::utils::bparse namespace xiv::utils::bparse
{ {

1
deps/mysqlConnector/ResultSetBase.h vendored
View file

@ -4,6 +4,7 @@
#include <list> #include <list>
#include <map> #include <map>
#include <iostream> #include <iostream>
#include <cstdint>
namespace Mysql namespace Mysql
{ {

1
deps/mysqlConnector/mysql_util.h vendored
View file

@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <cstdint>
typedef struct st_mysql_field MYSQL_FIELD; typedef struct st_mysql_field MYSQL_FIELD;
#ifndef UL64 #ifndef UL64

1
src/common/Crypt/base64.h
View file

@ -1,4 +1,5 @@
#include <string> #include <string>
#include <cstdint>
namespace Sapphire::Common::Util namespace Sapphire::Common::Util
{ {