Skip to content

Commit

Permalink
Minor changes for MSVC (acados#812)
Browse files Browse the repository at this point in the history
* remove double declaration of ocp_nlp_eval_residuals

* docs: fix MSVC 2019 command
  • Loading branch information
FreyJo authored and Martin Kirchengast committed Sep 15, 2022
1 parent 8a9d221 commit 92b8bb8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion docs/installation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Note: this workflow is preliminary and not thoroughly tested.
```
cmake -G "Visual Studio 15 2017 Win64" -DBLASFEO_TARGET=GENERIC -DACADOS_INSTALL_DIR=.. -DBUILD_SHARED_LIBS=OFF ..
# respectively for MVSC 2019
# cmake -G "Visual Studio 16 2019 Win64" -DBLASFEO_TARGET=GENERIC -DACADOS_INSTALL_DIR=.. -DBUILD_SHARED_LIBS=OFF ..
# cmake -G "Visual Studio 16 2019" -DBLASFEO_TARGET=GENERIC -DACADOS_INSTALL_DIR=.. -DBUILD_SHARED_LIBS=OFF ..
cmake --build . -j10 --target INSTALL --config Release
```
- In Matlab, run `mex -setup C` and select the same `MSVC` version.
Expand Down
2 changes: 0 additions & 2 deletions interfaces/acados_c/ocp_nlp_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,6 @@ ACADOS_SYMBOL_EXPORT int ocp_nlp_precompute(ocp_nlp_solver *solver, ocp_nlp_in *
/// \param nlp_out The output struct.
ACADOS_SYMBOL_EXPORT void ocp_nlp_eval_cost(ocp_nlp_solver *solver, ocp_nlp_in *nlp_in, ocp_nlp_out *nlp_out);

//
void ocp_nlp_eval_residuals(ocp_nlp_solver *solver, ocp_nlp_in *nlp_in, ocp_nlp_out *nlp_out);

/// Computes the residuals.
///
Expand Down

0 comments on commit 92b8bb8

Please sign in to comment.