[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kst/portto4/kst
From: Peter Kümmel <syntheticpp () gmx ! net>
Date: 2012-10-18 14:02:06
Message-ID: 20121018140206.CDEF5AC855 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1321283 by kuemmel:
mingw fixes
M +1 -1 cmake/3rdparty/CMakeLists.txt
M +1 -1 misc/mingw-release-build-deps.bat
M +1 -1 src/datasources/ascii/asciifilebuffer.cpp
M +1 -1 src/datasources/ascii/asciifiledata.cpp
M +0 -1 src/datasources/ascii/asciisource.cpp
--- branches/work/kst/portto4/kst/cmake/3rdparty/CMakeLists.txt #1321282:1321283
@@ -76,7 +76,7 @@
set(GETDATA_INCLUDEDIR ${install_dir}/include PARENT_SCOPE)
kst_external_static_lib(gdc_build libgetdata libgetdata.a)
kst_external_static_lib(gdcpp_build libgetdata libgetdata++.a)
-set(GETDATA_LIBRARIES gdc_build gdcpp_build ${gddeps} PARENT_SCOPE)
+set(GETDATA_LIBRARIES gdcpp_build gdc_build ${gddeps} PARENT_SCOPE)
# ZLIB needed by MATIO
--- branches/work/kst/portto4/kst/misc/mingw-release-build-deps.bat #1321282:1321283
@@ -18,7 +18,7 @@
echo cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 \
-Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%ver% \
-Dkst_version_string=%ver% -Dkst_make_program=%make%
-cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 \
-Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%ver% \
-Dkst_version_string=%ver% -Dkst_make_program=%make% +cmake ..\kst\cmake \
-G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=0 \
-Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% \
-Dkst_make_program=%make%
%make%
%make% install/strip
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciifilebuffer.cpp \
#1321282:1321283 @@ -134,7 +134,7 @@
if (!_file)
return;
- if (bytesToRead == 0 && numWindowChunks == 0 || windowSize == 0)
+ if (bytesToRead == 0 || numWindowChunks == 0 || windowSize == 0)
return;
int chunkSize = windowSize / numWindowChunks;
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciifiledata.cpp \
#1321282:1321283 @@ -99,7 +99,7 @@
//-------------------------------------------------------------------------------------------
AsciiFileData::AsciiFileData() :
- _array(new Array), _reread(false), _file(0), _fileRead(false),
+ _array(new Array), _file(0), _fileRead(false), _reread(false),
_begin(-1), _bytesRead(0), _rowBegin(-1), _rowsRead(0)
{
}
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciisource.cpp \
#1321282:1321283 @@ -18,7 +18,6 @@
#include "objectstore.h"
#include "math_kst.h"
-#include "kst_inf.h"
#include "kst_i18n.h"
#include "kst_atof.h"
#include "measuretime.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic