diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-08-26 16:16:23 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-08-26 16:16:23 +0400 |
commit | e61c3beb4801bf0c25fc17c9d9cc6363c2646689 (patch) | |
tree | 8251db87a04391a673d87034ad7f85e8333b3a72 | |
parent | aa6eac3aad850c543fe32c15c81cf6edcc0533dd (diff) |
Remove (comment out) auto-generating png form svg (r59382) in CMake, handy but gives nasty "false changes" in svn. Let's try not to forget to update PNGs when needed, then!
-rw-r--r-- | build_files/cmake/macros.cmake | 1 | ||||
-rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index e3c6169d77a..71706d87d5c 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -802,6 +802,7 @@ macro(data_to_c_simple endmacro() +# XXX Not used for now... macro(svg_to_png file_from file_to diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index bb008c452ab..6adc500baa4 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -47,17 +47,18 @@ if(WITH_BLENDER) # images data_to_c_simple(../../../../release/datafiles/splash.png SRC) - svg_to_png(../../../../release/datafiles/blender_icons.svg - ../../../../release/datafiles/blender_icons16.png - 90 SRC) + # XXX These are handy, but give nasty "false changes" in svn :/ + #svg_to_png(../../../../release/datafiles/blender_icons.svg + #../../../../release/datafiles/blender_icons16.png + #90 SRC) data_to_c_simple(../../../../release/datafiles/blender_icons16.png SRC) - svg_to_png(../../../../release/datafiles/blender_icons.svg - ../../../../release/datafiles/blender_icons32.png - 180 SRC) + #svg_to_png(../../../../release/datafiles/blender_icons.svg + #../../../../release/datafiles/blender_icons32.png + #180 SRC) data_to_c_simple(../../../../release/datafiles/blender_icons32.png SRC) - svg_to_png(../../../../release/datafiles/prvicons.svg - ../../../../release/datafiles/prvicons.png - 90 SRC) + #svg_to_png(../../../../release/datafiles/prvicons.svg + #../../../../release/datafiles/prvicons.png + #90 SRC) data_to_c_simple(../../../../release/datafiles/prvicons.png SRC) # brushes |