Small updates to enable MinGW builds on Windows #7
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
davegelwan
commented
Apr 5, 2023
| JULIA_H=C:/Users/dave/AppData/Local/Programs/Julia-1.7.0/include/julia | ||
| JLCXX_H=C:/Users/dave/.julia/artifacts/c59cc3313b777d84d3bfeaa750b97bbd9f2b7d12/include | ||
| JULIA_LIB=C:/Users/dave/AppData/Local/Programs/Julia-1.7.0/include/julia/../../lib | ||
| JLCXX_LIB=C:/Users/dave/.julia/artifacts/c59cc3313b777d84d3bfeaa750b97bbd9f2b7d12/include/../lib |
There was a problem hiding this comment.
Hard coded these paths because the Julia code above returns the paths with the wrong slashes \\ vs /
davegelwan
commented
Apr 5, 2023
| @@ -150,7 +150,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | |||
| am__v_at_0 = @ | |||
| am__v_at_1 = | |||
| DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | |||
| depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp | |||
| depcomp = "$(SHELL)" $(top_srcdir)/build-aux/depcomp | |||
There was a problem hiding this comment.
quotes required incase mingw is installed in a directory with spaces
davegelwan
commented
Apr 5, 2023
| for (size_t b=begin; b!=end; ++b) { | ||
| for (int d=0; d<3; d++) { | ||
| bodies[b].X[d] = drand48() * 2 * M_PI - M_PI; | ||
| bodies[b].X[d] = double(rand())/RAND_MAX * 2 * M_PI - M_PI; |
There was a problem hiding this comment.
srand48 and drand48 do not exist on Windows
davegelwan
commented
Apr 5, 2023
| @@ -20,7 +20,7 @@ using CxxWrap | |||
| const module_path = splitdir(@__FILE__)[1] # Path to this module | |||
|
|
|||
| # ------------ CODE ------------------------------------------------------------ | |||
| @wrapmodule(joinpath(module_path, "fmm")) | |||
| @wrapmodule(joinpath(module_path, "fmm.so.exe")) | |||
There was a problem hiding this comment.
Windows requires file extension and for some reason adds .exe
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.
Closes #6
These changes should be cleaned up to remove any hardcoded paths and to ensure Mac/Linux compatibility