diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-01 18:26:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-01 18:26:36 +0300 |
commit | e44743736f39246192b49912073a96b4a5cdd2ee (patch) | |
tree | d01a6c42376d9dbfc3f58965289e10be20def4ee /source/blender/makesdna | |
parent | e4a727626e34eef20e2b41cc3e26b41db4f360a0 (diff) | |
parent | 051e186d5c61dccfc776b8da9b83c598421be4e7 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 5b8dcd97108..06fd23cdff2 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -53,6 +53,7 @@ endif() # SRC_DNA_INC is defined in the parent dir add_cc_flags_custom_test(makesdna) +setup_platform_linker_flags() add_executable(makesdna ${SRC} ${SRC_DNA_INC}) |