sys: Fixes for MinGW support #346
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Tested successfully in Godot to compile with MinGW-GCC and MinGW-Clang for Windows. This doesn't include needed changes to CMakeLists.txt to support using a MinGW-GCC based toolchain to compile Embree with CMake. Co-authored-by: Pedro J. Estébanez <pedrojrulez@gmail.com>
akien-mga
commented
Nov 22, 2021
| @@ -99,7 +99,7 @@ | |||
| #define dll_import | |||
| #endif | |||
|
|
|||
| #ifdef __WIN32__ | |||
| #if defined(__WIN32__) && !defined(__MINGW32__) | |||
There was a problem hiding this comment.
The same might be relevant on line 94 for the definitions of dll_export and dll_import. But it's not part of the patch we're using in production for Godot (https://github.com/godotengine/godot/blob/master/thirdparty/embree/patches/godot-changes-misc.patch), so for this PR I chose to play it safe and only include what we tested.
akien-mga
commented
Nov 22, 2021
| @@ -99,7 +99,7 @@ | |||
| #define dll_import | |||
| #endif | |||
|
|
|||
| #ifdef __WIN32__ | |||
| #if defined(__WIN32__) && !defined(__MINGW32__) | |||
There was a problem hiding this comment.
This was needed to fix a crash issue when compiling Embree with MinGW-GCC, which we experienced upstream: godotengine/godot#45097
|
I merged this into our internal devel branch. The fix will be in the next release. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tested successfully in Godot to compile with MinGW-GCC and MinGW-Clang
for Windows.
This doesn't include needed changes to CMakeLists.txt to support using
a MinGW-GCC based toolchain to compile Embree with CMake.
Co-authored-by: @RandomShaper
Related to #279.