diff options
| -rw-r--r-- | build_files/cmake/macros.cmake | 63 | ||||
| -rw-r--r-- | release/scripts/op/uv.py | 2 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 |
3 files changed, 42 insertions, 24 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 08a571cceaf..9237f01a950 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1,30 +1,45 @@ -MACRO(BLENDERLIB_NOLIST - name - sources - includes) - # Gather all headers - FILE(GLOB_RECURSE INC_ALL *.h) - - INCLUDE_DIRECTORIES(${includes}) - ADD_LIBRARY(${name} ${INC_ALL} ${sources}) +IF(MSVC) + # only MSVC uses SOURCE_GROUP + MACRO(BLENDERLIB_NOLIST + name + sources + includes) + + MESSAGE(STATUS "Configuring library ${name}") + + # Gather all headers + FILE(GLOB_RECURSE INC_ALL *.h) + + INCLUDE_DIRECTORIES(${includes}) + ADD_LIBRARY(${name} ${INC_ALL} ${sources}) + + # Group by location on disk + SOURCE_GROUP(Files FILES CMakeLists.txt) + SET(ALL_FILES ${sources} ${INC_ALL}) + FOREACH(SRC ${ALL_FILES}) + STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}") + STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}") + STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}") + IF(REL_DIR) + SOURCE_GROUP(${REL_DIR} FILES ${SRC}) + ELSE(REL_DIR) + SOURCE_GROUP(Files FILES ${SRC}) + ENDIF(REL_DIR) + ENDFOREACH(SRC) + ENDMACRO(BLENDERLIB_NOLIST) +ELSE(MSVC) - # Group by location on disk - SOURCE_GROUP(Files FILES CMakeLists.txt) - SET(ALL_FILES ${sources} ${INC_ALL}) - FOREACH(SRC ${ALL_FILES}) - STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}") - STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}") - STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}") - IF(REL_DIR) - SOURCE_GROUP(${REL_DIR} FILES ${SRC}) - ELSE(REL_DIR) - SOURCE_GROUP(Files FILES ${SRC}) - ENDIF(REL_DIR) - ENDFOREACH(SRC) + MACRO(BLENDERLIB_NOLIST + name + sources + includes) - MESSAGE(STATUS "Configuring library ${name}") -ENDMACRO(BLENDERLIB_NOLIST) + MESSAGE(STATUS "Configuring library ${name}") + INCLUDE_DIRECTORIES(${includes}) + ADD_LIBRARY(${name} ${sources}) + ENDMACRO(BLENDERLIB_NOLIST) +ENDIF(MSVC) MACRO(BLENDERLIB name diff --git a/release/scripts/op/uv.py b/release/scripts/op/uv.py index 17520ff6d77..597421f305a 100644 --- a/release/scripts/op/uv.py +++ b/release/scripts/op/uv.py @@ -355,7 +355,9 @@ class ExportUVLayout(bpy.types.Operator): def invoke(self, context, event): + import os self.size = self._image_size(context) + self.filepath = os.path.splitext(bpy.data.filepath)[0] wm = context.window_manager wm.add_fileselect(self) return {'RUNNING_MODAL'} diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index ace58791d74..f2970293b05 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -89,6 +89,7 @@ struct wmKeyMap; struct wmOperator; struct wmWindowManager; struct View3D; +struct ToolSettings; /*new render funcs */ |