Remove the ../source entry from the Makefile of the relocator

This commit is contained in:
Maschell 2020-04-29 12:05:39 +02:00
parent 13e31e31f3
commit 7b8a421d7a
9 changed files with 10 additions and 11 deletions

View File

@ -35,7 +35,7 @@ SOURCES := src
DATA := data DATA := data
INCLUDES := src ../source INCLUDES := src
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation

View File

@ -3,7 +3,7 @@
#include <string.h> #include <string.h>
#include <vector> #include <vector>
#include "logger.h" #include "logger.h"
#include "common/module_defines.h" #include "../../source/common/module_defines.h"
dyn_linking_function_t * DynamicLinkingHelper::getOrAddFunctionEntryByName(dyn_linking_relocation_data_t * data, const char* functionName) { dyn_linking_function_t * DynamicLinkingHelper::getOrAddFunctionEntryByName(dyn_linking_relocation_data_t * data, const char* functionName) {
if(data == NULL) { if(data == NULL) {

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "common/dynamic_linking_defines.h" #include "../../source/common/dynamic_linking_defines.h"
#include "logger.h" #include "logger.h"
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "common/relocation_defines.h" #include "../../source/common/relocation_defines.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -1,6 +1,6 @@
#include "ModuleDataPersistence.h" #include "ModuleDataPersistence.h"
#include "DynamicLinkingHelper.h" #include "DynamicLinkingHelper.h"
#include "common/module_defines.h" #include "../../source/common/module_defines.h"
#include "ModuleData.h" #include "ModuleData.h"
#include "RelocationData.h" #include "RelocationData.h"
#include <coreinit/cache.h> #include <coreinit/cache.h>

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "common/module_defines.h" #include "../../source/common/module_defines.h"
#include "ModuleData.h" #include "ModuleData.h"
class ModuleDataPersistence { class ModuleDataPersistence {

View File

@ -21,7 +21,6 @@ EXPORT_VAR(uint32_t *, pMEMAllocFromDefaultHeapEx);
EXPORT_VAR(uint32_t *, pMEMAllocFromDefaultHeap); EXPORT_VAR(uint32_t *, pMEMAllocFromDefaultHeap);
EXPORT_VAR(uint32_t *, pMEMFreeToDefaultHeap); EXPORT_VAR(uint32_t *, pMEMFreeToDefaultHeap);
void InitFunctionPointers(void) { void InitFunctionPointers(void) {
OSDynLoad_Module handle; OSDynLoad_Module handle;
addr_OSDynLoad_Acquire = (void*) 0x0102A3B4; addr_OSDynLoad_Acquire = (void*) 0x0102A3B4;

View File

@ -5,13 +5,13 @@
#include <coreinit/dynload.h> #include <coreinit/dynload.h>
#include <coreinit/cache.h> #include <coreinit/cache.h>
#include <nsysnet/socket.h> #include <nsysnet/socket.h>
#include "common/dynamic_linking_defines.h" #include "../../source/common/dynamic_linking_defines.h"
#include "common/module_defines.h" #include "../../source/common/module_defines.h"
#include "RelocationData.h" #include "RelocationData.h"
#include "ModuleData.h" #include "ModuleData.h"
#include "ModuleDataPersistence.h" #include "ModuleDataPersistence.h"
#include "ElfUtils.h" #include "ElfUtils.h"
#include "common/relocation_defines.h" #include "../../source/common/relocation_defines.h"
#include "logger.h" #include "logger.h"
#include "dynamic.h" #include "dynamic.h"

View File

@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <utils/logger.h> #include "logger.h"
#include <nsysnet/socket.h> #include <nsysnet/socket.h>
#include <coreinit/debug.h> #include <coreinit/debug.h>