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

Fix Oodle on Linux (todo:: make this not suck)

Browse source
This commit is contained in:
Maple 2023-01-26 07:10:45 -03:00
parent 5b63cfb023
commit 81bbe690a8
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -15,7 +15,6 @@ add_custom_target( copy_runtime_files ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/web ${CMAKE_BINARY_DIR}/bin/web COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/web ${CMAKE_BINARY_DIR}/bin/web
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/sql_import.sh ${CMAKE_BINARY_DIR}/bin/sql_import.sh COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/sql_import.sh ${CMAKE_BINARY_DIR}/bin/sql_import.sh
COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/bin/data/actions COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/bin/data/actions
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/deps/oo2net_9_win64.dll ${CMAKE_BINARY_DIR}/bin/oo2net_9_win64.dll
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/deps/ffxiv-actions/actions ${CMAKE_BINARY_DIR}/bin/data/actions ) COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/deps/ffxiv-actions/actions ${CMAKE_BINARY_DIR}/bin/data/actions )
###################################### ######################################

4
deps/Oodle/CMakeLists.txt vendored
View file

@ -3,7 +3,7 @@ add_library(OodleNet STATIC IMPORTED GLOBAL)
set_target_properties( set_target_properties(
OodleNet OodleNet
PROPERTIES PROPERTIES
IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/deps/Oodle/oo2net_9_win64.lib" IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/deps/Oodle/liboo2netlinux64.a"
IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/Oodle/oo2net_9_win64.lib" IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/Oodle/liboo2netlinux64.a"
LINKER_LANGUAGE C LINKER_LANGUAGE C
) )

11
deps/Oodle/oodle2net.h vendored
View file

@ -1,18 +1,19 @@
#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 OodleNetwork1_Shared_Size( int32_t htbits );
extern "C" intptr_t __stdcall OodleNetwork1UDP_State_Size(); extern "C" intptr_t OodleNetwork1UDP_State_Size();
extern "C" void __stdcall OodleNetwork1_Shared_SetWindow( extern "C" void OodleNetwork1_Shared_SetWindow(
void* shared, void* shared,
int32_t htbits, int32_t htbits,
const void* window, const void* window,
int32_t windowSize int32_t windowSize
); );
extern "C" void __stdcall OodleNetwork1UDP_Train( extern "C" void OodleNetwork1UDP_Train(
void* state, void* state,
const void* shared, const void* shared,
const void** trainingPacketPointers, const void** trainingPacketPointers,
@ -20,7 +21,7 @@ extern "C" void __stdcall OodleNetwork1UDP_Train(
int32_t numTrainingPackets int32_t numTrainingPackets
); );
extern "C" bool __stdcall OodleNetwork1UDP_Decode( extern "C" bool OodleNetwork1UDP_Decode(
void* state, void* state,
const void* shared, const void* shared,
const void* enc, const void* enc,

2
src/common/Network/Oodle.h
View file

@ -2,7 +2,7 @@
#define _OODLE_H #define _OODLE_H
#include <vector> #include <vector>
#include <cstdint>
#include <oodle2net.h> #include <oodle2net.h>
namespace Sapphire::Network namespace Sapphire::Network