From 762a35f8b9024c9698029f6c3e69f358c962667e Mon Sep 17 00:00:00 2001
From: Rey <tonyo_lib@yahoo.com>
Date: Tue, 28 Feb 2023 00:09:56 -0600
Subject: [PATCH] Revert "Fix Oodle on Linux (todo:: make this not suck)"

This reverts commit 81bbe690a86c74fd67c90aefdf41f9d8fecdecc6.
---
 CMakeLists.txt             |  1 +
 deps/Oodle/CMakeLists.txt  |  4 ++--
 deps/Oodle/oodle2net.h     | 11 +++++------
 src/common/Network/Oodle.h |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8ec5a1c..6597c437 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ 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 ${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 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 )
 
 ######################################
diff --git a/deps/Oodle/CMakeLists.txt b/deps/Oodle/CMakeLists.txt
index 7473ec68..ef90dcbc 100644
--- a/deps/Oodle/CMakeLists.txt
+++ b/deps/Oodle/CMakeLists.txt
@@ -3,7 +3,7 @@ add_library(OodleNet STATIC IMPORTED GLOBAL)
 set_target_properties(
 	OodleNet
 	PROPERTIES
-	IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/deps/Oodle/liboo2netlinux64.a"
-	IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/Oodle/liboo2netlinux64.a"
+	IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/deps/Oodle/oo2net_9_win64.lib"
+	IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/Oodle/oo2net_9_win64.lib"
 	LINKER_LANGUAGE C
 )
\ No newline at end of file
diff --git a/deps/Oodle/oodle2net.h b/deps/Oodle/oodle2net.h
index 604f5e35..59c718c9 100644
--- a/deps/Oodle/oodle2net.h
+++ b/deps/Oodle/oodle2net.h
@@ -1,19 +1,18 @@
 #ifndef __OODLE2NET_H__
 #define __OODLE2NET_H__
-#include <stdint.h>
 
-extern "C" intptr_t  OodleNetwork1_Shared_Size( int32_t htbits );
+extern "C" intptr_t __stdcall OodleNetwork1_Shared_Size( int32_t htbits );
 
-extern "C" intptr_t  OodleNetwork1UDP_State_Size();
+extern "C" intptr_t __stdcall OodleNetwork1UDP_State_Size();
 
-extern "C" void  OodleNetwork1_Shared_SetWindow(
+extern "C" void __stdcall OodleNetwork1_Shared_SetWindow(
   void* shared,
   int32_t htbits,
   const void* window,
   int32_t windowSize
 );
 
-extern "C" void OodleNetwork1UDP_Train(
+extern "C" void __stdcall OodleNetwork1UDP_Train(
   void* state,
   const void* shared,
   const void** trainingPacketPointers,
@@ -21,7 +20,7 @@ extern "C" void OodleNetwork1UDP_Train(
   int32_t numTrainingPackets
 );
 
-extern "C" bool OodleNetwork1UDP_Decode(
+extern "C" bool __stdcall OodleNetwork1UDP_Decode(
   void* state,
   const void* shared,
   const void* enc,
diff --git a/src/common/Network/Oodle.h b/src/common/Network/Oodle.h
index 536980cb..b01dcf29 100644
--- a/src/common/Network/Oodle.h
+++ b/src/common/Network/Oodle.h
@@ -2,7 +2,7 @@
 #define _OODLE_H
 
 #include <vector>
-#include <cstdint>
+
 #include <oodle2net.h>
 
 namespace Sapphire::Network