Initial compile on linux

This commit is contained in:
Mr-Wiseguy
2023-10-23 15:03:05 -04:00
parent 5b594048db
commit 2865ef758e
11 changed files with 129 additions and 27 deletions
+5
View File
@@ -12,6 +12,11 @@ struct LoadedSection {
int32_t loaded_ram_addr;
size_t section_table_index;
LoadedSection(int32_t loaded_ram_addr_, size_t section_table_index_) {
loaded_ram_addr = loaded_ram_addr_;
section_table_index = section_table_index_;
}
bool operator<(const LoadedSection& rhs) {
return loaded_ram_addr < rhs.loaded_ram_addr;
}
+1
View File
@@ -1,6 +1,7 @@
#include <memory>
#include <fstream>
#include <array>
#include <cstring>
#include "recomp.h"
#include "../portultra/ultra64.h"
#include "../portultra/multilibultra.hpp"
+9 -2
View File
@@ -3,6 +3,7 @@
#endif
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <memory>
#include <cmath>
#include <unordered_map>
@@ -11,6 +12,12 @@
#include "recomp.h"
#include "../portultra/multilibultra.hpp"
#ifdef _WIN32
#define EXPORT __declspec(dllexport)
#else
#define EXPORT __attribute__((visibility("default")))
#endif
#ifdef _MSC_VER
inline uint32_t byteswap(uint32_t val) {
return _byteswap_ulong(val);
@@ -72,7 +79,7 @@ extern "C" void unload_overlays(int32_t ram_addr, uint32_t size);
std::unique_ptr<uint8_t[]> rdram_buffer;
recomp_context context{};
__declspec(dllexport) extern "C" void init() {
EXPORT extern "C" void init() {
{
std::basic_ifstream<uint8_t> rom_file{ get_rom_name(), std::ios::binary };
@@ -133,7 +140,7 @@ __declspec(dllexport) extern "C" void init() {
MEM_W(osMemSize, 0) = 8 * 1024 * 1024; // 8MB
}
__declspec(dllexport) extern "C" void start(void* window_handle, const Multilibultra::audio_callbacks_t* audio_callbacks, const Multilibultra::input_callbacks_t* input_callbacks) {
EXPORT extern "C" void start(void* window_handle, const Multilibultra::audio_callbacks_t* audio_callbacks, const Multilibultra::input_callbacks_t* input_callbacks) {
Multilibultra::set_audio_callbacks(audio_callbacks);
Multilibultra::set_input_callbacks(input_callbacks);
std::thread game_thread{[](void* window_handle) {
+2 -1
View File
@@ -1,5 +1,6 @@
#include <memory>
#include <Windows.h>
#include <cstring>
// #include <Windows.h>
#include "../portultra/multilibultra.hpp"
#include "rt64_layer.h"