Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stéphane Adjemian
dynare
Commits
ceff2dfe
Verified
Commit
ceff2dfe
authored
3 years ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
Windows package: fix bug introduced in
c5120e12
(cherry picked from commit
91e33488
)
parent
46d5f945
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
mex/build/octave/configure.ac
+11
-0
11 additions, 0 deletions
mex/build/octave/configure.ac
mex/build/octave/mex.am
+13
-1
13 additions, 1 deletion
mex/build/octave/mex.am
with
24 additions
and
1 deletion
mex/build/octave/configure.ac
+
11
−
0
View file @
ceff2dfe
...
...
@@ -98,6 +98,17 @@ case ${host_os} in
;;
esac
# Define an automake conditional for the Windows platform
case ${host_os} in
*mingw32*)
windows_api=yes
;;
*)
windows_api=no
;;
esac
AM_CONDITIONAL([WINDOWS_API], [test ${windows_api} = yes])
# Construct final output message
if test "$enable_mex_dynareplusplus" = yes; then
BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_OCTAVE="yes"
...
...
This diff is collapsed.
Click to expand it.
mex/build/octave/mex.am
+
13
−
1
View file @
ceff2dfe
...
...
@@ -8,7 +8,19 @@ DEFS += -DMEXEXT=\".mex\"
AM_CFLAGS = $(shell $(MKOCTFILE) -p CPICFLAG) -Wall -Wno-parentheses
AM_FCFLAGS = $(shell $(MKOCTFILE) -p FPICFLAG) -Wall -Wimplicit-interface
AM_CXXFLAGS = $(shell $(MKOCTFILE) -p CXXPICFLAG) -Wall -Wno-parentheses -Wold-style-cast
AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS) -L"$(shell $(MKOCTFILE) -p OCTLIBDIR)"
AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS)
# Mimick the behaviour of mkoctfile: link against Octave libraries on Windows only
# (it is required there, otherwise we get a link failure)
if WINDOWS_API
AM_LDFLAGS += -L"$(shell $(MKOCTFILE) -p OCTLIBDIR)"
LIBS += $(shell $(MKOCTFILE) -p OCTAVE_LIBS)
endif
# Unconditionally link against BLAS/LAPACK, since we tend to use them in
# many MEX files
LIBS += $(shell $(MKOCTFILE) -p BLAS_LIBS)
LIBS += $(shell $(MKOCTFILE) -p LAPACK_LIBS)
mexdir = $(libdir)/dynare/mex/octave
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment