mirror of
https://github.com/Mr-Wiseguy/Zelda64Recomp.git
synced 2024-11-22 12:59:14 +01:00
Initial compile on linux
This commit is contained in:
Mr-Wiseguy
parent
5b594048db
commit
2865ef758e
78
Makefile
78
Makefile
@ -2,7 +2,7 @@ CONFIG ?= Debug
|
||||
LIB ?= 0
|
||||
|
||||
ifeq ($(CONFIG),Debug)
|
||||
BUILD_DIR := build/debug
|
||||
BUILD_DIR := build/Debug
|
||||
FUNC_OPTFLAGS := -Og -g -fno-strict-aliasing
|
||||
OPTFLAGS := -Og -g -fno-strict-aliasing
|
||||
# Static C runtime linking
|
||||
@ -10,21 +10,56 @@ LIBS := -Wl,/nodefaultlib:libcmt -Wl,/nodefaultlib:ucrt -Wl,/nodefaultl
|
||||
# Dynamic
|
||||
# LIBS := -Wl,/nodefaultlib:libcmt -Wl,/nodefaultlib:ucrt -Wl,/nodefaultlib:libucrt -lmsvcrtd -lvcruntimed -lucrtd
|
||||
else ifeq ($(CONFIG),Release)
|
||||
BUILD_DIR := build/release
|
||||
BUILD_DIR := build/Release
|
||||
FUNC_OPTFLAGS := -O2 -g -fno-strict-aliasing
|
||||
OPTFLAGS := -O2 -g -fno-strict-aliasing
|
||||
# Static C runtime linking
|
||||
LIBS := -Wl,/nodefaultlib:libcmt -Wl,/nodefaultlib:ucrt -Wl,/nodefaultlib:libucrt -llibcmt -llibvcruntime -llibucrt
|
||||
# Dynamic
|
||||
# LIBS := -Wl,/nodefaultlib:libcmt -Wl,/nodefaultlib:ucrt -Wl,/nodefaultlib:libucrt -lmsvcrt -lvcruntime -lucrt
|
||||
else
|
||||
$(error "Invalid build configuration: $(CONFIG)")
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
DYN_EXT := .dll
|
||||
LIB_EXT := .lib
|
||||
EXE_EXT := .exe
|
||||
AR := clang++
|
||||
ARFLAGS := $(OPTFLAGS) -fuse-ld=llvm-lib -o
|
||||
# Static C runtime linking
|
||||
LIBS := -Wl,/nodefaultlib:libcmt -Wl,/nodefaultlib:ucrt -Wl,/nodefaultlib:libucrt -llibcmt -llibvcruntime -llibucrt
|
||||
# Dynamic
|
||||
# LIBS := -Wl,/nodefaultlib:libcmt -Wl,/nodefaultlib:ucrt -Wl,/nodefaultlib:libucrt -lmsvcrt -lvcruntime -lucrt
|
||||
LIB_DIR ?= C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\lib\x64
|
||||
UCRT_DIR ?= C:\Program Files (x86)\Windows Kits\10\lib\10.0.22000.0\ucrt\x64;
|
||||
SDK_DIR ?= C:\Program Files (x86)\Windows Kits\10\lib\10.0.22000.0\um\x64
|
||||
define mkdir
|
||||
mkdir $(subst /,\\,$(1))
|
||||
endef
|
||||
define rmdir
|
||||
rmdir /S /Q $(subst /,\\,$(1))
|
||||
endef
|
||||
else
|
||||
DYN_EXT := .so
|
||||
LIB_EXT := .a
|
||||
EXE_EXT :=
|
||||
LIB_PRE := lib
|
||||
AR := ar
|
||||
ARFLAGS := rcs
|
||||
define mkdir
|
||||
mkdir -p $(1)
|
||||
endef
|
||||
define rmdir
|
||||
rm -rf $(1)
|
||||
endef
|
||||
endif
|
||||
|
||||
SRC_DIRS := portultra src rsp
|
||||
|
||||
# Add the main folder if not building a library
|
||||
ifneq ($(LIB),1)
|
||||
SRC_DIRS += src/main
|
||||
endif
|
||||
|
||||
FUNCS_DIR := RecompiledFuncs
|
||||
FUNCS_LIB := $(BUILD_DIR)/RecompiledFuncs.lib
|
||||
FUNCS_LIB := $(BUILD_DIR)/$(LIB_PRE)RecompiledFuncs$(LIB_EXT)
|
||||
FUNCS_C_SRCS := $(wildcard $(FUNCS_DIR)/*.c)
|
||||
FUNCS_CXX_SRCS := $(wildcard $(FUNCS_DIR)/*.cpp)
|
||||
|
||||
@ -44,34 +79,37 @@ ALL_OBJS := $(C_OBJS) $(CXX_OBJS)
|
||||
|
||||
CC := clang
|
||||
CXX := clang++
|
||||
LIB := clang++
|
||||
LD := clang++
|
||||
|
||||
FUNC_CFLAGS := $(FUNC_OPTFLAGS) -c -Wno-unused-but-set-variable
|
||||
FUNC_CXXFLAGS := $(FUNC_OPTFLAGS) -std=c++20 -c
|
||||
FUNC_CPPFLAGS := -Iinclude
|
||||
LIBFLAGS := $(OPTFLAGS) -fuse-ld=llvm-lib
|
||||
LIB_DIR ?= C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\lib\x64
|
||||
UCRT_DIR ?= C:\Program Files (x86)\Windows Kits\10\lib\10.0.22000.0\ucrt\x64;
|
||||
SDK_DIR ?= C:\Program Files (x86)\Windows Kits\10\lib\10.0.22000.0\um\x64
|
||||
|
||||
WARNFLAGS := -Wall -Wextra -Wpedantic -Wno-gnu-anonymous-struct
|
||||
CFLAGS := -ffunction-sections -fdata-sections -march=nehalem $(OPTFLAGS) $(WARNFLAGS) -c
|
||||
CXXFLAGS := -ffunction-sections -fdata-sections -march=nehalem $(OPTFLAGS) $(WARNFLAGS) -std=c++20 -c
|
||||
CPPFLAGS := -Iinclude -Ithirdparty
|
||||
LDFLAGS := -v -Wl,/OPT:REF $(OPTFLAGS) $(LIBS) -L"$(LIB_DIR:;=)" -L"$(UCRT_DIR:;=)" -L"$(SDK_DIR:;=)" lib/RT64/$(CONFIG)/RT64.lib
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
LDFLAGS := -v -Wl,/OPT:REF $(OPTFLAGS) $(LIBS) -L"$(LIB_DIR:;=)" -L"$(UCRT_DIR:;=)" -L"$(SDK_DIR:;=)" lib/RT64/$(CONFIG)/RT64.lib
|
||||
else
|
||||
LDFLAGS := $(OPTFLAGS) -L$(BUILD_DIR) -lRecompiledFuncs -L. -lrt64 -lSDL2 -lX11 -Wl,--gc-sections
|
||||
FUNC_CFLAGS += -ffunction-sections -fdata-sections
|
||||
FUNC_CXXFLAGS += -ffunction-sections -fdata-sections
|
||||
EXTRA_DEPS := librt64.a
|
||||
endif
|
||||
|
||||
ifeq ($(LIB),1)
|
||||
TARGET := $(BUILD_DIR)/MMRecomp.dll
|
||||
TARGET := $(BUILD_DIR)/MMRecomp$(DYN_EXT)
|
||||
LDFLAGS += -shared
|
||||
else
|
||||
TARGET := $(BUILD_DIR)/MMRecomp.exe
|
||||
TARGET := $(BUILD_DIR)/MMRecomp$(EXE_EXT)
|
||||
endif
|
||||
|
||||
default: $(TARGET)
|
||||
|
||||
clean:
|
||||
rmdir /S /Q $(subst /,\\,$(BUILD_DIR))
|
||||
$(call rmdir,$(BUILD_DIR))
|
||||
|
||||
cleanfuncs:
|
||||
|
||||
@ -83,7 +121,7 @@ $(FUNCS_C_OBJS) : $(BUILD_DIR)/%.o : %.c | $(FUNC_BUILD_DIR)
|
||||
@$(CC) $(FUNC_CFLAGS) $(FUNC_CPPFLAGS) $^ -o $@
|
||||
|
||||
$(FUNCS_LIB): $(ALL_FUNC_OBJS) | $(BUILD_DIR)
|
||||
$(LIB) $(LIBFLAGS) $(FUNC_BUILD_DIR)/*.o -o $@
|
||||
$(AR) $(ARFLAGS) $@ $(FUNC_BUILD_DIR)/*.o
|
||||
|
||||
|
||||
|
||||
@ -93,11 +131,11 @@ $(CXX_OBJS) : $(BUILD_DIR)/%.o : %.cpp | $(BUILD_SRC_DIRS)
|
||||
$(C_OBJS) : $(BUILD_DIR)/%.o : %.c | $(BUILD_SRC_DIRS)
|
||||
$(CC) -MMD -MF $(@:.o=.d) $(CFLAGS) $(CPPFLAGS) $< -o $@
|
||||
|
||||
$(TARGET): $(FUNCS_LIB) $(ALL_OBJS) | $(BUILD_SRC_DIRS)
|
||||
$(LD) $(LDFLAGS) -o $@ $^
|
||||
$(TARGET): $(FUNCS_LIB) $(ALL_OBJS) $(EXTRA_DEPS) | $(BUILD_SRC_DIRS)
|
||||
$(LD) -o $@ $^ $(LDFLAGS)
|
||||
|
||||
$(BUILD_SRC_DIRS) $(FUNC_BUILD_DIR) $(BUILD_DIR):
|
||||
mkdir $(subst /,\\,$@)
|
||||
$(call mkdir,$@)
|
||||
|
||||
-include $(ALL_OBJS:.o=.d)
|
||||
|
||||
|
||||
@ -304,6 +304,8 @@ extern int32_t section_addresses[];
|
||||
// ctx->r2 = setjmp(buf->storage->buffer); \
|
||||
//}
|
||||
|
||||
void pause_self(uint8_t *rdram);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -58,6 +58,11 @@ template<u32 bits> inline auto sclamp(s64 x) -> s64 {
|
||||
return (x > m) ? m : (x < -b) ? -b : x;
|
||||
}
|
||||
|
||||
template<u32 bits> inline auto sclip(s64 x) -> s64 {
|
||||
enum : u64 { b = 1ull << (bits - 1), m = b * 2 - 1 };
|
||||
return ((x & m) ^ b) - b;
|
||||
}
|
||||
|
||||
struct RSP {
|
||||
using r32 = uint32_t;
|
||||
using cr32 = const r32;
|
||||
|
||||
@ -45,9 +45,14 @@ typedef struct {
|
||||
// const unsigned int* RDRAM_SIZE;
|
||||
} GFX_INFO;
|
||||
|
||||
#ifdef _WIN32
|
||||
#define DLLEXPORT extern "C" __declspec(dllexport)
|
||||
#define DLLIMPORT extern "C" __declspec(dllimport)
|
||||
#define CALL __cdecl
|
||||
#else
|
||||
#define DLLEXPORT extern "C" __attribute__((visibility("default")))
|
||||
#define DLLIMPORT extern "C"
|
||||
#endif
|
||||
|
||||
// Dynamic loading
|
||||
//DLLEXPORT int (CALL *InitiateGFX)(GFX_INFO Gfx_Info) = nullptr;
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
#include <utility>
|
||||
#include <mutex>
|
||||
#include <queue>
|
||||
#include <cstring>
|
||||
|
||||
#include <Windows.h>
|
||||
#include "blockingconcurrentqueue.h"
|
||||
|
||||
#include "ultra64.h"
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
#ifdef _WIN32
|
||||
|
||||
#include <Windows.h>
|
||||
|
||||
#include "ultra64.h"
|
||||
@ -7,3 +9,5 @@ extern "C" unsigned int sleep(unsigned int seconds) {
|
||||
Sleep(seconds * 1000);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -7,8 +7,10 @@
|
||||
#include "multilibultra.hpp"
|
||||
|
||||
// Native APIs only used to set thread names for easier debugging
|
||||
#ifdef _WIN32
|
||||
#if defined(_WIN32)
|
||||
#include <Windows.h>
|
||||
#elif defined(__linux__)
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
extern "C" void bootproc();
|
||||
@ -43,7 +45,7 @@ void run_thread_function(uint8_t* rdram, uint64_t addr, uint64_t sp, uint64_t ar
|
||||
|
||||
struct thread_terminated : std::exception {};
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined(_WIN32)
|
||||
void Multilibultra::set_native_thread_name(const std::string& name) {
|
||||
std::wstring wname{name.begin(), name.end()};
|
||||
|
||||
@ -80,6 +82,38 @@ void Multilibultra::set_native_thread_priority(ThreadPriority pri) {
|
||||
}
|
||||
// SetThreadPriority(GetCurrentThread(), nPriority);
|
||||
}
|
||||
#elif defined(__linux__)
|
||||
void Multilibultra::set_native_thread_name(const std::string& name) {
|
||||
pthread_setname_np(pthread_self(), name.c_str());
|
||||
}
|
||||
|
||||
void Multilibultra::set_native_thread_priority(ThreadPriority pri) {
|
||||
// TODO linux thread priority
|
||||
printf("set_native_thread_priority unimplemented\n");
|
||||
// int nPriority = THREAD_PRIORITY_NORMAL;
|
||||
|
||||
// // Convert ThreadPriority to Win32 priority
|
||||
// switch (pri) {
|
||||
// case ThreadPriority::Low:
|
||||
// nPriority = THREAD_PRIORITY_BELOW_NORMAL;
|
||||
// break;
|
||||
// case ThreadPriority::Normal:
|
||||
// nPriority = THREAD_PRIORITY_NORMAL;
|
||||
// break;
|
||||
// case ThreadPriority::High:
|
||||
// nPriority = THREAD_PRIORITY_ABOVE_NORMAL;
|
||||
// break;
|
||||
// case ThreadPriority::VeryHigh:
|
||||
// nPriority = THREAD_PRIORITY_HIGHEST;
|
||||
// break;
|
||||
// case ThreadPriority::Critical:
|
||||
// nPriority = THREAD_PRIORITY_TIME_CRITICAL;
|
||||
// break;
|
||||
// default:
|
||||
// throw std::runtime_error("Invalid thread priority!");
|
||||
// break;
|
||||
// }
|
||||
}
|
||||
#endif
|
||||
|
||||
static void _thread_func(RDRAM_ARG PTR(OSThread) self_, PTR(thread_func_t) entrypoint, PTR(void) arg) {
|
||||
|
||||
@ -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,6 +1,7 @@
|
||||
#include <memory>
|
||||
#include <fstream>
|
||||
#include <array>
|
||||
#include <cstring>
|
||||
#include "recomp.h"
|
||||
#include "../portultra/ultra64.h"
|
||||
#include "../portultra/multilibultra.hpp"
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
#include <memory>
|
||||
#include <Windows.h>
|
||||
#include <cstring>
|
||||
// #include <Windows.h>
|
||||
|
||||
#include "../portultra/multilibultra.hpp"
|
||||
#include "rt64_layer.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user