From 41f325243b12fe886bb1cf0d7df5c105162577f1 Mon Sep 17 00:00:00 2001 From: Date: Sun, 5 Jun 2016 13:06:27 -0400 Subject: [PATCH 1/2] needs #ifndef _WIN32 in class member --- Source/Project64-core/N64System/Mips/MemoryVirtualMem.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h index 2f648770b..e52949876 100644 --- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h +++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h @@ -22,6 +22,11 @@ #include #endif +#ifndef _WIN32 +#include +/* siginfo_t */ +#endif + /* * 64-bit Windows exception recovery facilities will expect to interact with * the 64-bit registers of the Intel architecture (e.g., rax instead of eax). @@ -101,7 +106,7 @@ public: int32_t MemoryFilter(uint32_t dwExptCode, void * lpExceptionPointer); void UpdateFieldSerration(uint32_t interlaced); #ifndef _WIN32 - static bool SetupSegvHandler (void); + static bool SetupSegvHandler(void); static void segv_handler(int signal, siginfo_t *siginfo, void *sigcontext); #endif From 46287ddead9ac089fb82086fe268f583eba9e156 Mon Sep 17 00:00:00 2001 From: Date: Sun, 5 Jun 2016 13:07:49 -0400 Subject: [PATCH 2/2] output prefix with "lib"- to link with -l --- Source/Script/Unix/project64-core.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Script/Unix/project64-core.sh b/Source/Script/Unix/project64-core.sh index 5bc422a9e..c15ecd428 100755 --- a/Source/Script/Unix/project64-core.sh +++ b/Source/Script/Unix/project64-core.sh @@ -261,4 +261,4 @@ $obj/Settings/type/TmpNumber.o \ $obj/Settings/type/TmpString.o" echo Linking static library objects for Project64-core... -ar rcs $obj/project64-core.a $OBJ_LIST +ar rcs $obj/libproject64-core.a $OBJ_LIST