from:"Alex K"

Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37885] trunk/blender: cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for

2011-06-30 Thread Alex K

I did


set(PLATFORM_LINKFLAGS /SUBSYSTEM:CONSOLE /STACK:2097152
/INCREMENTAL:NO
/NODEFAULTLIB:msvcrt.lib,msvcmrt.lib,msvcurt.lib,msvcrtd.lib)

# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
set(PLATFORM_LINKFLAGS /MACHINE:X64 /OPT:NOREF
${PLATFORM_LINKFLAGS})
else()
set(PLATFORM_LINKFLAGS /MACHINE:IX86 /LARGEADDRESSAWARE
${PLATFORM_LINKFLAGS})
endif()

set(PLATFORM_LINKFLAGS_DEBUG /NODEFAULTLIB:LIBCMT.lib,
libc.lib /FORCE:MULTIPLE)

Dunno, visual studio tried to link LIBCMT.lib in debug mode also, causing a
conflict. /FORCE:MULTIPLE resolved it.
Btw, I used cmake 2.8.4

Thanks,
Alex
___
Bf-committers mailing list
Bf-committers@blender.org
http://lists.blender.org/mailman/listinfo/bf-committers

Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37885] trunk/blender: cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for

2011-06-29 Thread Alex K

Hi.
This patch causes build error with cmake + vs2010:
error MSB6001: Invalid command line switch for CL.exe. The value
[BUILD_LINKFLAGS=/MACHINE:X64 /OPT:NOREF /SUBSYSTEM:CONSOLE /STACK:2097152
/INCREMENTAL:NO  /NODEFAULTLIB:msvcrt.lib] contains an odd number of
double-quote characters. Only even numbers of literal double-quote
characters are acceptable to command line tools.C:\Program Files
(x86)\MSBuild\Microsoft.Cpp\v4.0\Platforms\x64\Microsoft.Cpp.x64.Targets
When CMakeLists.txt and macros.cmake reversed to 37884, Blender builds fine.

Alex


On Mon, Jun 27, 2011 at 10:49 PM, Campbell Barton ideasma...@gmail.comwrote:

 Revision: 37885

 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=37885
 Author:   campbellbarton
 Date: 2011-06-28 02:49:49 + (Tue, 28 Jun 2011)
 Log Message:
 ---
 cleanup for cmake msvc build options, reference some libs directly, fix
 conflicting flags /Ob1 and /Zi for debug

 Modified Paths:
 --
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py

 Modified: trunk/blender/CMakeLists.txt
 ===
 --- trunk/blender/CMakeLists.txt2011-06-28 02:12:31 UTC (rev 37884)
 +++ trunk/blender/CMakeLists.txt2011-06-28 02:49:49 UTC (rev 37885)
 @@ -243,13 +243,26 @@
  set(WITH_BINRELOC OFF)

  # MAXOSX only, set to avoid uninitialized
 -set(EXETYPE )
 +set(EXETYPE)

 +# C/C++ flags
 +set(PLATFORM_CFLAGS)
 +
  # these are added to later on.
 -set(C_WARNINGS )
 -set(CXX_WARNINGS )
 +set(C_WARNINGS)
 +set(CXX_WARNINGS)

 +# libraries to link the binary with passed to target_link_libraries()
 +# known as LLIBS to scons
 +set(PLATFORM_LINKLIBS)

 +# Added to linker flags in setup_liblinks
 +# - CMAKE_EXE_LINKER_FLAGS
 +# - CMAKE_EXE_LINKER_FLAGS_DEBUG
 +set(PLATFORM_LINKFLAGS)
 +set(PLATFORM_LINKFLAGS_DEBUG)
 +
 +
  # disabled for now, not supported
  # option(WITH_WEBPLUGIN Enable Web Plugin (Unix only) OFF)

 @@ -419,24 +432,24 @@
endif()

# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by
 using --as-needed
 -   set(LLIBS -lutil -lc -lm -lpthread -lstdc++)
 +   set(PLATFORM_LINKLIBS -lutil -lc -lm -lpthread -lstdc++)

if(NOT WITH_HEADLESS)
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h
 ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)

 -   list(APPEND LLIBS ${X11_X11_LIB})
 +   list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})

if(WITH_X11_XINPUT)
 -   list(APPEND LLIBS ${X11_Xinput_LIB})
 +   list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
endif()
endif()

if(CMAKE_SYSTEM_NAME MATCHES Linux)
if(NOT WITH_PYTHON_MODULE)
# BSD's dont use libdl.so
 -   list(APPEND LLIBS -ldl)
 +   list(APPEND PLATFORM_LINKLIBS -ldl)
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS
 ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
 @@ -547,14 +560,16 @@

if(MSVC)
if(CMAKE_CL_64)
 -   set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32
 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
 +   set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32
 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
else()
 -   set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32
 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
 +   set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32
 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
endif()
 -
 -   set(CMAKE_CXX_FLAGS /D_CRT_NONSTDC_NO_DEPRECATE
 /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB
 /nologo /Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267
 /we4013 CACHE STRING MSVC MT C++ flags  FORCE)
 -   set(CMAKE_C_FLAGS   /D_CRT_NONSTDC_NO_DEPRECATE
 /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB
 /nologo /Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267
 /we4013 /EHsc CACHE STRING MSVC MT C++ flags  FORCE)

 +   add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE
 /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
 +
 +   set(CMAKE_CXX_FLAGS /nologo /J /W0 /Gd /wd4018 /wd4244
 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 CACHE STRING MSVC MT C++ flags 
 FORCE)
 +   set(CMAKE_C_FLAGS   /nologo /J /W0 /Gd /wd4018 /wd4244
 /wd4305 /wd4800 /wd4065 /wd4267

Re: [Bf-committers] when blender2.57beta starts not make zoom at mouse wheel

2011-04-06 Thread Alex K

Hi.
I also encountered this bug few times on start up but it is hard to
replicate. I had a similar problem in Firefox few times. Dunno, may be it is
driver problem. My mouse is Logitech.
Win7 x64

Alex

On Wed, Apr 6, 2011 at 11:15 PM, iozk hz iozk...@gmail.com wrote:

 'some times' to my allways that open blender thats not happend in the 2.49b
 version windows 7
 ___
 Bf-committers mailing list
 Bf-committers@blender.org
 http://lists.blender.org/mailman/listinfo/bf-committers

___
Bf-committers mailing list
Bf-committers@blender.org
http://lists.blender.org/mailman/listinfo/bf-committers

Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33686] trunk/blender/source/blender/ editors/space_file/file_draw.c: Bugfix #25231

2010-12-15 Thread Alex K

 file_shorten_string(fname, width+1, 0 );
^shouldn't be removed because it is used in thumbnails mode to display large
names
http://www.pasteall.org/pic/show.php?id=7526

Small consequence is center alignment is of by 4/2=2 pixels due to  +4.0f
Maybe we should check for align?
or
textwidth =( FILE_IMGDISPLAY == params-display) ? layout-tile_w :
layout-column_widths[COLUMN_NAME] + 4;

Alex



2010/12/15 Ton Roosendaal t...@blender.org

 Revision: 33686

 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=33686
 Author:   ton
 Date: 2010-12-15 16:56:06 +0100 (Wed, 15 Dec 2010)

 Log Message:
 ---
 Bugfix #25231

 File Window: text clipping was tiny bit too narrow. It was also
 clipping text twice even ;)

 Modified Paths:
 --
trunk/blender/source/blender/editors/space_file/file_draw.c

 Modified: trunk/blender/source/blender/editors/space_file/file_draw.c
 ===
 --- trunk/blender/source/blender/editors/space_file/file_draw.c 2010-12-15
 15:28:03 UTC (rev 33685)
 +++ trunk/blender/source/blender/editors/space_file/file_draw.c 2010-12-15
 15:56:06 UTC (rev 33686)
 @@ -26,6 +26,7 @@
  * * END GPL LICENSE BLOCK *
  */

 +#include math.h
  #include string.h

  #include BLI_blenlib.h
 @@ -292,20 +293,18 @@

  static void file_draw_string(int sx, int sy, const char* string, float
 width, int height, short align)
  {
 -   char fname[FILE_MAXFILE];
 -   rcti rect;
 -   float sw;
uiStyle *style= U.uistyles.first;
uiFontStyle fs = style-widgetlabel;
 +   rcti rect;
 +   char fname[FILE_MAXFILE];

fs.align = align;

BLI_strncpy(fname,string, FILE_MAXFILE);
 -   sw = file_shorten_string(fname, width+1, 0 );
 -
 -
 +
 +   /* no text clipping needed, uiStyleFontDraw does it but is a bit
 too strict (for buttons it works) */
rect.xmin = sx;
 -   rect.xmax = sx + width;
 +   rect.xmax = sx + ceil(width+4.0f);
rect.ymin = sy - height;
rect.ymax = sy;



 ___
 Bf-blender-cvs mailing list
 bf-blender-...@blender.org
 http://lists.blender.org/mailman/listinfo/bf-blender-cvs




-- 
Homer: Now, good night, son.
Bart: Uh, Dad?
Homer: What.
Bart: What is the mind?
Is it just a system of impulses?
Or is it something tangible?
Homer: Relax.  What is mind?  No matter.  What is matter?  Never mind!
Bart: Thanks, Dad.
Homer: Good night, son.
 -Good Night (The Simpsons short)
___
Bf-committers mailing list
Bf-committers@blender.org
http://lists.blender.org/mailman/listinfo/bf-committers

Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37885] trunk/blender: cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for

Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37885] trunk/blender: cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for

Re: [Bf-committers] when blender2.57beta starts not make zoom at mouse wheel

Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33686] trunk/blender/source/blender/ editors/space_file/file_draw.c: Bugfix #25231

4 matches

Site Navigation

Mail list logo

Footer information