zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix linking and some linux things

Browse source
This commit is contained in:
Magnus Norddahl 2018-12-19 00:23:38 +01:00
parent c6a3a6a3fb
commit 7785dd1b56
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -115,7 +115,8 @@ if( WIN32 )
comdlg32 comdlg32
ws2_32 ws2_32
setupapi setupapi
oleaut32 ) oleaut32
dbghelp )
if( NOT ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) if( NOT ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
set( ZDOOM_LIBS ${ZDOOM_LIBS} DelayImp ) set( ZDOOM_LIBS ${ZDOOM_LIBS} DelayImp )
@ -125,7 +126,6 @@ if( WIN32 )
if( DX_dxguid_LIBRARY ) if( DX_dxguid_LIBRARY )
list( APPEND ZDOOM_LIBS "${DX_dxguid_LIBRARY}" ) list( APPEND ZDOOM_LIBS "${DX_dxguid_LIBRARY}" )
endif() endif()
set( ZDOOM_LIBS ${ZDOOM_LIBS} libdbghelp.a )
endif() endif()
else() else()
if( APPLE ) if( APPLE )

5
src/scripting/vm/jit_runtime.cpp
View file

@ -771,6 +771,8 @@ void *AddJitFunction(asmjit::CodeHolder* code, JitCompiler *compiler)
#endif #endif
} }
JitDebugInfo.Push({ compiler->GetScriptFunction()->PrintableName, compiler->GetScriptFunction()->SourceFileName, startaddr, endaddr });
return p; return p;
} }
#endif #endif
@ -850,7 +852,6 @@ static int CaptureStackTrace(int max_frames, void **out_frames)
} }
#ifdef WIN32 #ifdef WIN32
#pragma comment(lib, "dbghelp.lib")
class NativeSymbolResolver class NativeSymbolResolver
{ {
public: public:
@ -897,7 +898,7 @@ public:
{ {
FString s; FString s;
char **strings; char **strings;
void **frames; void *frames[1] = { frame };
strings = backtrace_symbols(frames, 1); strings = backtrace_symbols(frames, 1);
// Decode the strings // Decode the strings