Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
747d1c96
Unverified
Commit
747d1c96
authored
Dec 15, 2017
by
Hein-Pieter van Braam
Committed by
GitHub
Dec 15, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14723 from hpvb/fix-thekla-ming-32bit-build
Fix 32bit MingW build for thekla_altas
parents
a0dd3aba
241de958
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
detect.py
platform/windows/detect.py
+1
-1
Debug.cpp
thirdparty/thekla_atlas/nvcore/Debug.cpp
+9
-0
No files found.
platform/windows/detect.py
View file @
747d1c96
...
...
@@ -269,7 +269,7 @@ def configure(env):
if
(
env
[
"openmp"
]):
env
.
Append
(
CPPFLAGS
=
[
'-fopenmp'
])
env
.
Append
(
LI
BS
=
[
'go
mp'
])
env
.
Append
(
LI
NKFLAGS
=
[
'-fopen
mp'
])
## Compile flags
...
...
thirdparty/thekla_atlas/nvcore/Debug.cpp
View file @
747d1c96
...
...
@@ -394,8 +394,10 @@ namespace
#pragma warning(disable:4748)
static
NV_NOINLINE
int
backtrace
(
void
*
trace
[],
int
maxcount
)
{
CONTEXT
ctx
=
{
0
};
// -- GODOT start --
#if NV_CPU_X86 && !NV_CPU_X86_64
ctx
.
ContextFlags
=
CONTEXT_CONTROL
;
#if NV_CC_MSVC
_asm
{
call
x
x:
pop
eax
...
...
@@ -404,6 +406,13 @@ namespace
mov
ctx
.
Esp
,
esp
}
#else
register
long
unsigned
int
ebp
asm
(
"ebp"
);
ctx
.
Eip
=
(
DWORD
)
__builtin_return_address
(
0
);
ctx
.
Ebp
=
ebp
;
ctx
.
Esp
=
(
DWORD
)
__builtin_frame_address
(
0
);
#endif
// -- GODOT end --
#else
RtlCaptureContext
(
&
ctx
);
// Not implemented correctly in x86.
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment