diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 08:33:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 08:36:19 +0400 |
| commit | 2b4c68b902b261127f7deabf922048c41be6fb55 (patch) | |
| tree | 1c40311a6c8e13ea4754fc692283b11cafdb8bea /source/blender/editors/uvedit | |
| parent | 295116ea6b3a81a6c7b84d8a9d21288108c5f19e (diff) | |
CMake Build: option to compile without opennl/superlu.
Diffstat (limited to 'source/blender/editors/uvedit')
| -rw-r--r-- | source/blender/editors/uvedit/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 39 |
2 files changed, 44 insertions, 3 deletions
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 62d4b01cab7..45edbde7482 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -28,7 +28,6 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/guardedalloc - ../../../../intern/opennl/extern ) set(INC_SYS @@ -51,4 +50,11 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +if(WITH_OPENNL) + add_definitions(-DWITH_OPENNL) + list(APPEND INC_SYS + ../../../../intern/opennl/extern + ) +endif() + blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 2d33a2d3937..e5c3510db4b 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -35,8 +35,6 @@ #include "BLI_boxpack2d.h" #include "BLI_convexhull2d.h" -#include "ONL_opennl.h" - #include "uvedit_intern.h" #include "uvedit_parametrizer.h" @@ -47,6 +45,10 @@ #include "BLI_sys_types.h" /* for intptr_t support */ +#ifdef WITH_OPENNL + +#include "ONL_opennl.h" + /* Utils */ #if 0 @@ -4715,3 +4717,36 @@ void param_flush_restore(ParamHandle *handle) } } +#else /* WITH_OPENNL */ + +#ifdef __GNUC__ +# pragma GCC diagnostic ignored "-Wunused-parameter" +#endif + +/* stubs */ +void param_face_add(ParamHandle *handle, ParamKey key, int nverts, + ParamKey *vkeys, float **co, float **uv, + ParamBool *pin, ParamBool *select, float normal[3]) {} +void param_edge_set_seam(ParamHandle *handle, + ParamKey *vkeys) {} +void param_aspect_ratio(ParamHandle *handle, float aspx, float aspy) {} +ParamHandle *param_construct_begin(void) { return NULL; } +void param_construct_end(ParamHandle *handle, ParamBool fill, ParamBool impl) {} +void param_delete(ParamHandle *handle) {} + +void param_stretch_begin(ParamHandle *handle) {} +void param_stretch_blend(ParamHandle *handle, float blend) {} +void param_stretch_iter(ParamHandle *handle) {} +void param_stretch_end(ParamHandle *handle) {} + +void param_pack(ParamHandle *handle, float margin, bool do_rotate) {} +void param_average(ParamHandle *handle) {} + +void param_flush(ParamHandle *handle) {} +void param_flush_restore(ParamHandle *handle) {} + +void param_lscm_begin(ParamHandle *handle, ParamBool live, ParamBool abf) {} +void param_lscm_solve(ParamHandle *handle) {} +void param_lscm_end(ParamHandle *handle) {} + +#endif /* WITH_OPENNL */ |